X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fe2fsprogs%2FMakefile;h=60047c763ab859b6021c24d9bc95e78b2a572b66;hb=4761ab998558d4cd5c99d624d9f760b78616bb5d;hp=413e965a0ecc1d48f44dce305c8fb0ceb6699441;hpb=8d8b85c12f7f9d7a82b3153b395f54fb076565bf;p=openwrt.git

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 413e965a0e..60047c763a 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,28 +8,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.13
-PKG_MD5SUM:=7508a192c7a9471e2128424f4eafac1c
+PKG_VERSION:=1.42.8
+PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
 
+HOST_BUILD_PARALLEL:=1
+
 include $(INCLUDE_DIR)/host-build.mk
 
-TARGET_CFLAGS += $(FPIC)
+HOST_CFLAGS += $(FPIC)
+HOST_LDFLAGS += $(HOST_STATIC_LINKING)
 
-CONFIGURE_ARGS += \
+HOST_CONFIGURE_ARGS += \
 	--disable-shared \
+	--disable-elf-shlibs \
 	--enable-static \
-	--disable-rpath \
-	--enable-elf-shlibs \
 	--enable-dynamic-e2fsck \
-	--disable-tls
+	--disable-tls \
+	--disable-nls
+
+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