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:45 +0100 |
commit | d6b53084af4d2923fccd6d6c9b43721fb4f414fb (patch) | |
tree | 2e5f35022aa59100497563fe1d21e915a4b8cf68 /meta/recipes-devtools/bison/bison | |
parent | 0a0ffb2ca8655bf0b1bd39ae8b141a548465e63c (diff) | |
download | poky-d6b53084af4d2923fccd6d6c9b43721fb4f414fb.tar.gz |
bison: upgrade 3.0.4 -> 3.1
Remove patches applied upstream.
(From OE-Core rev: 5890ed343981b600148a1b4f1bedaf1e55519c67)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/bison/bison')
3 files changed, 0 insertions, 88 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 @@ | |||
1 | From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | lib/gnulib.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
19 | index e1d74db..c0e92dd 100644 | ||
20 | --- a/lib/gnulib.mk | ||
21 | +++ b/lib/gnulib.mk | ||
22 | @@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local | ||
23 | case '$(host_os)' in \ | ||
24 | darwin[56]*) \ | ||
25 | need_charset_alias=true ;; \ | ||
26 | - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ | ||
27 | + darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ | ||
28 | need_charset_alias=false ;; \ | ||
29 | *) \ | ||
30 | need_charset_alias=true ;; \ | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
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 @@ | |||
1 | From 5b9204eee4b06b48d54ecc3ef3a0b56fc5cc84f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Fri, 24 Apr 2015 00:38:32 -0700 | ||
4 | Subject: [PATCH] src/local.mk: fix parallel issue | ||
5 | |||
6 | Fixed: | ||
7 | rm -f src/yacc src/yacc.tmp | ||
8 | echo '#! /bin/sh' >src/yacc.tmp | ||
9 | /bin/bash: src/yacc.tmp: No such file or directory | ||
10 | Makefile:6670: recipe for target 'src/yacc' failed | ||
11 | |||
12 | Upstream-Status: Submitted [ http://lists.gnu.org/archive/html/bison-patches/2017-07/msg00000.html ] | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | Signed-off-by: Dengke Du <dengke.du@windriver.com> | ||
16 | --- | ||
17 | src/local.mk | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/src/local.mk b/src/local.mk | ||
21 | index 573ad00..28bfae4 100644 | ||
22 | --- a/src/local.mk | ||
23 | +++ b/src/local.mk | ||
24 | @@ -119,6 +119,7 @@ MOSTLYCLEANFILES += src/yacc | ||
25 | |||
26 | src/yacc: | ||
27 | $(AM_V_GEN)rm -f $@ $@.tmp | ||
28 | + $(AM_V_at)$(MKDIR_P) src | ||
29 | $(AM_V_at)echo '#! /bin/sh' >$@.tmp | ||
30 | $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp | ||
31 | $(AM_V_at)chmod a+x $@.tmp | ||
32 | -- | ||
33 | 2.8.1 | ||
34 | |||
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 @@ | |||
1 | Fix gnulib issues found with glibc 2.28 libio.h removal | ||
2 | |||
3 | see | ||
4 | https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Index: bison-3.0.4/lib/fseterr.c | ||
10 | =================================================================== | ||
11 | --- bison-3.0.4.orig/lib/fseterr.c | ||
12 | +++ bison-3.0.4/lib/fseterr.c | ||
13 | @@ -29,7 +29,7 @@ fseterr (FILE *fp) | ||
14 | /* Most systems provide FILE as a struct and the necessary bitmask in | ||
15 | <stdio.h>, because they need it for implementing getc() and putc() as | ||
16 | fast macros. */ | ||
17 | -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
18 | +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | ||
19 | fp->_flags |= _IO_ERR_SEEN; | ||
20 | #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ | ||
21 | fp_->_flags |= __SERR; | ||