Return-Path: Received: from mail.stusta.mhn.de (mail.stusta.mhn.de [141.84.69.5]) by mail.openembedded.org (Postfix) with ESMTP id A078E7D718 for ; Tue, 7 May 2019 13:11:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail.stusta.mhn.de (Postfix) with ESMTPSA id 44z0PP2Nk8z5l for ; Tue, 7 May 2019 15:11:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stusta.de; s=default; t=1557234713; bh=qG4ARj8sjNtB73CFr17wkf9aFskgaIX/O/OC9eWZrfA=; h=From:To:Subject:Date:From; b=UfzmTH0QuxV9t0pkN2b4LWs5I8+4Q0KFk5a6QC5da3vz3xeryYCATHNTDFvvB5Bh5 UZ+h8oxP1nJE5jelXFtYYpeRGzSoQiCtWiU7FwivRYYVosJmUJ86kS0HBOcbrZSqgx l7VpC71SSe39OJ+HZfNJP60+il75Seyo6jFgoPR/V/C7/IJxMMqC+BP/emn99mG5FY fa3vZJnHlYk2Ynx9Dnp0tGIrOLn7mE4FfqSB3yNdKILqO9PLVkyLqRUG9syu3ZZ8vR v8SHuTF+18s0ns+5B/5FE0AvX682Qn1iigATSk/HvxLhNltr9fqetJxK4QyUrX7ZK1 p3Tt6p4WI0Fe8whD7HfIGJ9dTS1mdsRxy4Et/ibMGOgssXRwPVP1All0zBLu63ZDpo id9L+GFbs8vcj+30+X2NMo9ay1UnBN61gdtX0z2KOnbhCHcdEUrTmKjx5zx8ROaLw+ LmwaiLsUXQJUDaC1ESQ6BANVQVY1FYQljSREUwROYV5pwULdS8e1a+n/vp8HtTyLB4 8Bqee2N0JKzK3/FyE+t7QZ0pjuKcovX0UaCOXOewHqWw4WTl2U17taACNlAwJkUXI8 VFgZqBEn4rMSi3O90Nts5JILjsf4rD5GZa4B66cJ6Rfr5b+XRRfil0r/Q8owgyJXzE t5/9VgA+9nRt0GDdXIOzcX6A= From: Adrian Bunk To: openembedded-core@lists.openembedded.org Date: Tue, 7 May 2019 16:11:44 +0300 Message-Id: <20190507131151.31070-5-bunk@stusta.de> X-Mailer: git-send-email 2.17.1 Subject: [PATCH] bison: upgrade 3.0.4 -> 3.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2019 13:11:53 -0000 Remove patches applied upstream. Signed-off-by: Adrian Bunk --- ...charset_alias-when-building-for-musl.patch | 33 ------------------ ...0001-src-local.mk-fix-parallel-issue.patch | 34 ------------------- .../recipes-devtools/bison/bison/gnulib.patch | 21 ------------ .../bison/{bison_3.0.4.bb => bison_3.1.bb} | 7 ++-- 4 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 meta/recipes-devtools/bison/bison/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch delete mode 100644 meta/recipes-devtools/bison/bison/gnulib.patch rename meta/recipes-devtools/bison/{bison_3.0.4.bb => bison_3.1.bb} (81%) 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 -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 ---- - 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 -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 -Signed-off-by: Dengke Du ---- - 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 - -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 - , 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 similarity index 81% rename from meta/recipes-devtools/bison/bison_3.0.4.bb rename to 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 -- 2.17.1