X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/284a3cfc2beea39262e4245562cd65017ccc25b5..cb73b00a8f8179a1ed4c253170351618309b3d95:/tools/e2fsprogs/Makefile

diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 2a7eb6a4e..0bfcfb4f0 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.41.10
-PKG_MD5SUM:=f9c7bb5c036a119453ce02fa871038da
+PKG_VERSION:=1.41.13
+PKG_MD5SUM:=7508a192c7a9471e2128424f4eafac1c
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,45 +17,23 @@ PKG_SOURCE_URL:=@SF/e2fsprogs
 
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Configure
-	( cd $(HOST_BUILD_DIR); \
-		./configure \
-			--target=$(GNU_HOST_NAME) \
-			--host=$(GNU_HOST_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--sysconfdir=/etc \
-			--datadir=/usr/share \
-			--localstatedir=/var \
-			--mandir=/usr/man \
-			--infodir=/usr/info \
-	)
-endef
-
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
-	--enable-shared \
+	--disable-shared \
 	--enable-static \
 	--disable-rpath \
 	--enable-elf-shlibs \
 	--enable-dynamic-e2fsck \
 	--disable-tls
 
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		CFLAGS="$(HOST_CFLAGS)" all
-endef
-
 define Host/Install
-	install -m0755 $(HOST_BUILD_DIR)/e2fsck/e2fsck $(STAGING_DIR_HOST)/bin/
-	install -m0755 $(HOST_BUILD_DIR)/misc/tune2fs $(STAGING_DIR_HOST)/bin/
+	$(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
 
 define Host/Clean