X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fe2fsprogs%2FMakefile;h=f11ce52ca09c73a65574a98653780442dbbcdccb;hb=07e8c217cb79a19c59fcb34ea6de39aa91a625b6;hp=893fcf421f3f393cdbf1f5810695b9f38a03ba76;hpb=65a07aa7cf20ea5ff4798a41a86eb35dca17be54;p=openwrt%2Fopenwrt.git

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 893fcf421f..f11ce52ca0 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,28 +8,40 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.12
-PKG_MD5SUM:=1b24a21fc0c2381ef420961cbfec733f
+PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
+PKG_VERSION:=1.44.4
+PKG_HASH:=ee03b2f2180614c5ae5f6dd2666f8808de61c3d8b37d22ba86cc6daea25be55a
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/
+
+HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
-TARGET_CFLAGS += $(FPIC)
+ifneq ($(shell $(HOSTCC) --version | grep clang),)
+  HOST_CFLAGS += -D__GNUC_PREREQ\(...\)=0
+endif
+HOST_CFLAGS += $(FPIC)
+
+HOST_CONFIGURE_ARGS += \
+	--disable-elf-shlibs \
+	--enable-libuuid \
+	--disable-tls \
+	--disable-nls
 
-CONFIGURE_ARGS += \
-	--disable-shared \
-	--enable-static \
-	--disable-rpath \
-	--enable-elf-shlibs \
-	--enable-dynamic-e2fsck \
-	--disable-tls
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	rm -rf $(HOST_BUILD_DIR)/doc
+endef
 
 define Host/Install
 	$(Host/Install/Default)
 	$(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install
+	mkdir -p $(STAGING_DIR_HOST)/include/e2fsprogs
+	$(CP) $(STAGING_DIR_HOST)/include/uuid $(STAGING_DIR_HOST)/include/e2fsprogs/
+	rm -rf $(STAGING_DIR_HOST)/include/uuid
 	$(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
 endef