X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fflex;h=65247f308a00e0c9c83d72b98a91afe7fb907ac2;hp=0c43e4acdfa9f35583cc45f6dc0c4ab3d38fed65;hb=8d3fb4309b0f66ef3119c852a3deff77b805c8f8;hpb=df106d88e5a7eeafb9298b0febbe02e9a349728f

diff --git a/lfs/flex b/lfs/flex
index 0c43e4acdf..65247f308a 100644
--- a/lfs/flex
+++ b/lfs/flex
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,25 @@
 
 include Config
 
-VER        = 2.5.35
+VER        = 2.6.4
 
 THISAPP    = flex-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+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
+endif
+
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +52,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 10714e50cea54dc7a227e3eddcd44d57
+$(DL_FILE)_MD5 = 2882e3179748cc9f9c23ec593d6adc8d
 
 install : $(TARGET)
 
@@ -69,10 +81,12 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
+	cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
+		./configure --prefix=$(PREFIX) --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
 	ln -sfv libfl.a /usr/lib/libl.a
 	echo "#!/bin/sh"			>  /usr/bin/lex