toolchain: update to gcc-7.3.0 and enable retpolines on x86_64 and i586

[ipfire-2.x.git] / lfs / flex

diff --git a/lfs/flex b/lfs/flex
index 3101c86a169f21d6f7698fdf4d0bd5fa31ff58bf..d665c47be540819d7689ad63e78b7a62988ef685 100644 (file)
--- a/lfs/flex
+++ b/lfs/flex
@@ -24,13 +24,28 @@
 
 include Config
 
-VER        = 2.6.1
+VER        = 2.6.4
 
 THISAPP    = flex-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+# Normal build or $(TOOLS_DIR) build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_MAKE = 
+  EXTRA_INSTALL = 
+
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_MAKE = 
+  EXTRA_INSTALL = 
+endif
+
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +55,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cd3c86290fc2676a641aefafeb10848a
+$(DL_FILE)_MD5 = 2882e3179748cc9f9c23ec593d6adc8d
 
 install : $(TARGET)
 
@@ -70,7 +85,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
+       cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
+               ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install
 ifeq "$(ROOT)" ""