X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fxfsprogs;h=07410f7207ed96dda0bb09da4a333b2d3af26c9b;hb=8438e2e427e346b3609b1f752d874e40dc1d19f4;hp=9c3239ea46d506a678bdf2c76d03ac289d92d78c;hpb=6ae131ef235c11d9ff7419b9b84be7132bd25fb5;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index 9c3239ea46..07410f7207 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -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,14 +24,22 @@
 
 include Config
 
-VER        = 2.9.4
+VER        = 4.18.0
 
 THISAPP    = xfsprogs-$(VER)
-DL_FILE    = xfsprogs_$(VER)-1.tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CONFIGURE_OPTIONS = \
+	--enable-readline=yes
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	CONFIGURE_OPTIONS += \
+		--enable-lto=no
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 174683e3b86b587ed59823fdbbb96ea4
+$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8
 
 install : $(TARGET)
 
@@ -72,13 +80,10 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i "/include/a #include <sys\/stat.h>" \
-		libxfs/xfs_ialloc.c quota/quot.c mdrestore/xfs_mdrestore.c \
-		rtcp/xfs_rtcp.c
-	cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
-												LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING) DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
+		LOCAL_CONFIGURE_OPTIONS="$(CONFIGURE_OPTIONS)"
+	cd $(DIR_APP) && make install install-dev
 	cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la
 	chmod -v 755 /lib/libhandle.so*
 	rm -f /lib/libhandle.{a,la,so}