瀏覽代碼

utils/e2fsprogs: Update to 1.43.6

Update e2fsprogs to 1.43.6
Disable compilation of fuse2fs (we don't package it)
Disable thread support (only affects fuse2fs)
Enable linking with libblkid instead of using private (included) version.
The libblkid is ~210KBytes in size, but with using the shared library
the binaries are ~25KBytes smaller. This also brings it in sync with
most other Linux distributions.

Signed-off-by: Daniel Engberg <[email protected]>
Daniel Engberg 8 年之前
父節點
當前提交
5b1660a538
共有 1 個文件被更改,包括 7 次插入9 次删除
  1. 7 9
      package/utils/e2fsprogs/Makefile

+ 7 - 9
package/utils/e2fsprogs/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=e2fsprogs
 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.43.5
-PKG_HASH:=261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17
+PKG_VERSION:=1.43.6
+PKG_HASH:=c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402
 PKG_RELEASE:=1
 PKG_RELEASE:=1
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -45,7 +45,7 @@ define Package/libext2fs
 $(call Package/e2fsprogs/Default)
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   SECTION:=libs
   CATEGORY:=Libraries
   CATEGORY:=Libraries
-  DEPENDS:=+libuuid
+  DEPENDS:=+libuuid +libblkid
   TITLE:=ext2/3/4 filesystem library
   TITLE:=ext2/3/4 filesystem library
 endef
 endef
 
 
@@ -109,18 +109,17 @@ endef
 
 
 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
 TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections
 
 
-CONFIGURE_VARS += \
-	ac_cv_lib_pthread_sem_init=no
-
 CONFIGURE_ARGS += \
 CONFIGURE_ARGS += \
 	--disable-testio-debug \
 	--disable-testio-debug \
 	--enable-elf-shlibs	\
 	--enable-elf-shlibs	\
 	--disable-libuuid	\
 	--disable-libuuid	\
-	--enable-libblkid	\
+	--disable-libblkid	\
 	--disable-uuidd		\
 	--disable-uuidd		\
 	--disable-tls		\
 	--disable-tls		\
 	--disable-nls		\
 	--disable-nls		\
-	--disable-rpath
+	--disable-rpath		\
+	--disable-threads	\
+	--disable-fuse2fs
 
 
 define Build/Prepare
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(call Build/Prepare/Default)
@@ -139,7 +138,6 @@ define Build/Compile
 		LDFLAGS=-Wl,--gc-sections \
 		LDFLAGS=-Wl,--gc-sections \
 		BUILDCC="$(HOSTCC)" \
 		BUILDCC="$(HOSTCC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \
 		ELF_OTHER_LIBS="$(TARGET_LDFLAGS) -luuid" \
 		ELF_OTHER_LIBS="$(TARGET_LDFLAGS) -luuid" \
 		SYSLIBS="$(TARGET_LDFLAGS) -ldl -L$(PKG_BUILD_DIR)/lib/ -l:libcom_err.so.0.0" \
 		SYSLIBS="$(TARGET_LDFLAGS) -ldl -L$(PKG_BUILD_DIR)/lib/ -l:libcom_err.so.0.0" \
 		V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \
 		V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \