tools: e2fsprogs: delete doc/ directory after unpacking to ensure that makeinfo is...

[openwrt.git] / tools / e2fsprogs / Makefile

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index e13160b..3e43472 100644 (file)
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,27 +8,39 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.10
-PKG_MD5SUM:=f9c7bb5c036a119453ce02fa871038da
+PKG_VERSION:=1.42.4
+PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
 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