toolchain: Add bison

This is required by glibc 2.27

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/bison b/lfs/bison
index 322dd26f05fcf133bf8406e1088214808c2ca817..9e539f0a4cb6cbddbb8a7995f3f437c152c99551 100644 (file)
--- a/lfs/bison
+++ b/lfs/bison
@@ -30,7 +30,14 @@ THISAPP    = bison-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  EXTRA_CONFIG = --prefix=/usr
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -70,8 +77,8 @@ $(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) && ./configure --prefix=/usr --disable-nls --docdir=/usr/share/doc/$(THISAPP)
+       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 906429a8fb7d281fa32a64aa804f110382a06c76..88aff0ec3245cd76ba6a5096aef1920df929d8d7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -952,6 +952,7 @@ buildtoolchain() {
        lfsmake1 tar
        lfsmake1 texinfo
        lfsmake1 xz
+       lfsmake1 bison
        lfsmake1 flex
        lfsmake1 fake-environ
        lfsmake1 strip

diff --git a/src/patches/glibc/glibc-2.25-gcc-7.patch b/src/patches/glibc/glibc-2.25-gcc-7.patch
deleted file mode 100644 (file)
index 1e68b09..0000000
--- a/src/patches/glibc/glibc-2.25-gcc-7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/malloc/hooks.c b/malloc/hooks.c
-index 4398c0a017..2c6cebc889 100644
---- a/malloc/hooks.c
-+++ b/malloc/hooks.c
-@@ -347,11 +347,18 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
-       newmem = _int_realloc (&main_arena, oldp, oldsize, nb);
-     }
- 
-+  DIAG_PUSH_NEEDS_COMMENT;
-+#if __GNUC_PREREQ (7, 0)
-+  /* GCC 7 warns about magic_p may be used uninitialized.  But we never
-+     reach here if magic_p is uninitialized.  */
-+  DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
-+#endif
-   /* mem2chunk_check changed the magic byte in the old chunk.
-      If newmem is NULL, then the old chunk will still be used though,
-      so we need to invert that change here.  */
-   if (newmem == NULL)
-     *magic_p ^= 0xFF;
-+  DIAG_POP_NEEDS_COMMENT;
- 
-   __libc_lock_unlock (main_arena.mutex);
- 
\ No newline at end of file