diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-07 16:11:44 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-08 22:56:40 +0100 |
commit | 5890ed343981b600148a1b4f1bedaf1e55519c67 (patch) | |
tree | 0b90981f0529a80e0bb5d66b99bda15ad5bc8106 | |
parent | e697fe9c109234f914976ccec78a0776aa59d08d (diff) | |
download | openembedded-core-5890ed343981b600148a1b4f1bedaf1e55519c67.tar.gz |
bison: upgrade 3.0.4 -> 3.1
Remove patches applied upstream.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
-rw-r--r-- | meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch | 34 | ||||
-rw-r--r-- | meta/recipes-devtools/bison/bison/gnulib.patch | 21 | ||||
-rw-r--r-- | meta/recipes-devtools/bison/bison_3.1.bb (renamed from meta/recipes-devtools/bison/bison_3.0.4.bb) | 7 |
4 files changed, 2 insertions, 93 deletions
diff --git a/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4c..0000000000 --- a/meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ --- -2.1.4 - diff --git a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch deleted file mode 100644 index 1e86f55220..0000000000 --- a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5b9204eee4b06b48d54ecc3ef3a0b56fc5cc84f8 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Fri, 24 Apr 2015 00:38:32 -0700 -Subject: [PATCH] src/local.mk: fix parallel issue - -Fixed: -rm -f src/yacc src/yacc.tmp -echo '#! /bin/sh' >src/yacc.tmp -/bin/bash: src/yacc.tmp: No such file or directory -Makefile:6670: recipe for target 'src/yacc' failed - -Upstream-Status: Submitted [ http://lists.gnu.org/archive/html/bison-patches/2017-07/msg00000.html ] - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - src/local.mk | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/local.mk b/src/local.mk -index 573ad00..28bfae4 100644 ---- a/src/local.mk -+++ b/src/local.mk -@@ -119,6 +119,7 @@ MOSTLYCLEANFILES += src/yacc - - src/yacc: - $(AM_V_GEN)rm -f $@ $@.tmp -+ $(AM_V_at)$(MKDIR_P) src - $(AM_V_at)echo '#! /bin/sh' >$@.tmp - $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp - $(AM_V_at)chmod a+x $@.tmp --- -2.8.1 - diff --git a/meta/recipes-devtools/bison/bison/gnulib.patch b/meta/recipes-devtools/bison/bison/gnulib.patch deleted file mode 100644 index 7eaf0ce0fa..0000000000 --- a/meta/recipes-devtools/bison/bison/gnulib.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix gnulib issues found with glibc 2.28 libio.h removal - -see -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: bison-3.0.4/lib/fseterr.c -=================================================================== ---- bison-3.0.4.orig/lib/fseterr.c -+++ bison-3.0.4/lib/fseterr.c -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ - fp_->_flags |= __SERR; diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.1.bb index f1b05da416..a743bfdb81 100644 --- a/meta/recipes-devtools/bison/bison_3.0.4.bb +++ b/meta/recipes-devtools/bison/bison_3.1.bb @@ -10,18 +10,15 @@ SECTION = "devel" DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://dont-depend-on-help2man.patch.patch \ - file://0001-src-local.mk-fix-parallel-issue.patch \ file://add-with-bisonlocaledir.patch \ - file://gnulib.patch \ " # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4" -SRC_URI[md5sum] = "c342201de104cc9ce0a21e0ad10d4021" -SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1" +SRC_URI[md5sum] = "db7e431785ad96870bfa570a15cab079" +SRC_URI[sha256sum] = "7c2464ad6cb7b513b2c350a092d919327e1f63d12ff024836acbb504475da5c6" inherit autotools gettext texinfo |