bison: Fix building with glibc >= 2.28

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-10-19 09:00:04 +01:00
parent 7b0f7a6e1d
commit 68dba55dda
2 changed files with 22 additions and 2 deletions

View File

@@ -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

View File

@@ -0,0 +1,19 @@
commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
Author: Paul Eggert <address@hidden>
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
<stdio.h>, 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__