From 68dba55dda776904de66c7ba5eaf1d2342a544bc Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 19 Oct 2018 09:00:04 +0100 Subject: [PATCH] bison: Fix building with glibc >= 2.28 Signed-off-by: Michael Tremer --- lfs/bison | 5 +++-- src/patches/bison-3.0.5-gnulib-fseterr.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/patches/bison-3.0.5-gnulib-fseterr.patch diff --git a/lfs/bison b/lfs/bison index e961a4956a..c1a6103cd0 100644 --- a/lfs/bison +++ b/lfs/bison @@ -24,7 +24,7 @@ include Config -VER = 3.0.4 +VER = 3.0.5 THISAPP = bison-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects =$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c342201de104cc9ce0a21e0ad10d4021 +$(DL_FILE)_MD5 = 3e54f20988ecd1b62044e25481e5f06b install : $(TARGET) @@ -75,6 +75,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bison-3.0.5-gnulib-fseterr.patch cd $(DIR_APP) && ./configure --prefix=$(PREFIX) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/bison-3.0.5-gnulib-fseterr.patch b/src/patches/bison-3.0.5-gnulib-fseterr.patch new file mode 100644 index 0000000000..cd2a482896 --- /dev/null +++ b/src/patches/bison-3.0.5-gnulib-fseterr.patch @@ -0,0 +1,19 @@ +commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e +Author: Paul Eggert +Date: Mon Mar 5 10:56:29 2018 -0800 + + fflush: adjust to glibc 2.28 libio.h removal + (Only part of this commit was backported as needed.) + +diff -Nrup a/lib/fseterr.c b/lib/fseterr.c +--- a/lib/fseterr.c 2018-05-08 06:02:48.000000000 -0400 ++++ b/lib/fseterr.c 2018-08-14 16:06:19.636282264 -0400 +@@ -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_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.39.2