X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fgawk;h=793b358e2447cdb120d9094d369596ff37942808;hp=c8cb89231f7642129811afad4c52e056cee36329;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=b5548cbb5ccb07c77fd8336f822b830aaf7278e5

diff --git a/lfs/gawk b/lfs/gawk
index c8cb89231f..793b358e24 100644
--- a/lfs/gawk
+++ b/lfs/gawk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016   IPFire Team  <info@ipfire.org>                    #
+# 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        #
@@ -18,35 +18,29 @@
 #                                                                             #
 ###############################################################################
 
+
 ###############################################################################
 # Definitions
 ###############################################################################
 
 include Config
 
-VER        = 3.1.5
+VER        = 4.1.4
 
 THISAPP    = gawk-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
-#
+# Normal build or $(TOOLS_DIR) build.
 ifeq "$(ROOT)" ""
-  TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
+	TARGET = $(DIR_INFO)/$(THISAPP)
+	EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib --disable-nls
 else
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
+	TARGET = $(DIR_INFO)/$(THISAPP)-tools
+	EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
 endif
 
-EXTRA_CONFIG += ac_cv_func_working_mktime=yes
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -55,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5703f72d0eea1d463f735aad8222655f
+$(DL_FILE)_MD5 = 4e7dbc81163e60fd4f0b52496e7542c9
 
 install : $(TARGET)
 
@@ -84,14 +78,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-segfault_fix-1.patch
-endif
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && echo "#define HAVE_LANGINFO_CODESET 1"	>> config.h
-	cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1"		>> config.h
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)