summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2019-01-16 00:19:31 +0000
committergutteridge <gutteridge@pkgsrc.org>2019-01-16 00:19:31 +0000
commit0196a182f44caa3bc1c4ad2825a0cc879292e99b (patch)
tree24128221f04bf501b77da84436f1bc3cd776effd
parent85948ca4d79eb6c41fe75309d4556ba629f83f09 (diff)
downloadpkgsrc-0196a182f44caa3bc1c4ad2825a0cc879292e99b.tar.gz
devel/bison: add patches to fix building with glibc >= 2.27
Relates to PR pkg/53826, further details are provided there. This is a temporary fix: the newest release of Bison addresses this by including a newer version of gnulib. I'm applying this less obtrusive change for now. No PKGREVISION, because there should be no change to existing packages, it addresses build failures only.
-rw-r--r--devel/bison/distinfo3
-rw-r--r--devel/bison/patches/patch-lib_fseterr.c17
2 files changed, 19 insertions, 1 deletions
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 0e1e5406bec..83c970536e1 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.47 2017/08/18 21:43:03 adam Exp $
+$NetBSD: distinfo,v 1.48 2019/01/16 00:19:31 gutteridge Exp $
SHA1 (bison-3.0.4.tar.xz) = 8270497aad88c7dd4f2c317298c50513fb0c3c8e
RMD160 (bison-3.0.4.tar.xz) = 414959f3d619d8e4875e241ee02852b2ff13c2cb
SHA512 (bison-3.0.4.tar.xz) = bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
Size (bison-3.0.4.tar.xz) = 1973796 bytes
SHA1 (patch-data_glr.c) = a2e0900ed995e4320e80f8ed05eae8e82be50502
+SHA1 (patch-lib_fseterr.c) = 59dd24cc0612d7a562fa6a0e89f7d6911ad2147e
SHA1 (patch-lib_isnan.c) = 5b44fc6e2e97e36f91cd784bf3a38ad459fccdab
SHA1 (patch-lib_stdio.in.h) = bb793f0c8f56c3a838609f8a86cf5afc70420da8
SHA1 (patch-lib_vasnprintf.c) = 2bced6c121efc9bc5894174c7745ba89e8f53033
diff --git a/devel/bison/patches/patch-lib_fseterr.c b/devel/bison/patches/patch-lib_fseterr.c
new file mode 100644
index 00000000000..93b957853df
--- /dev/null
+++ b/devel/bison/patches/patch-lib_fseterr.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_fseterr.c,v 1.1 2019/01/16 00:19:31 gutteridge Exp $
+
+Work around glibc changes that broke dependent gnulib functionality.
+Patch from: http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+
+--- lib/fseterr.c.orig 2019-01-15 19:37:01.340382604 +0000
++++ lib/fseterr.c
+@@ -29,7 +29,8 @@ 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 || defined _IO_ftrylockfile || __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;