rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.git] / tools / e2fsprogs / Makefile

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 330e10475d1713041ac484279ceb0fad37dcbd74..e1027599257a3765cbd43800060c2508e50194e0 100644 (file)
--- 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,35 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.14
-PKG_MD5SUM:=05f70470aea2ef7efbb0845b2b116720
+PKG_VERSION:=1.42.13
+PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265
 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_CONFIGURE_ARGS += \
+       --disable-elf-shlibs \
+       --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