diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2017-09-08 00:44:26 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-17 00:26:52 +0200 |
| commit | 5b1660a5387bfe7e522945b7318dd9b0f8ac307d (patch) | |
| tree | 9811ac447154ab93ad8a9c8fcc6b4251a1e79d25 /package/utils | |
| parent | 344fde35e3331dd999b38298b4743dce9a88583d (diff) | |
| download | upstream-5b1660a5387bfe7e522945b7318dd9b0f8ac307d.tar.gz upstream-5b1660a5387bfe7e522945b7318dd9b0f8ac307d.tar.bz2 upstream-5b1660a5387bfe7e522945b7318dd9b0f8ac307d.zip | |
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 <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/e2fsprogs/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index b10ba8a862..c327e5d14b 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.43.5 -PKG_HASH:=261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17 +PKG_VERSION:=1.43.6 +PKG_HASH:=c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -45,7 +45,7 @@ define Package/libext2fs $(call Package/e2fsprogs/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libuuid + DEPENDS:=+libuuid +libblkid TITLE:=ext2/3/4 filesystem library endef @@ -109,18 +109,17 @@ endef TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections -CONFIGURE_VARS += \ - ac_cv_lib_pthread_sem_init=no - CONFIGURE_ARGS += \ --disable-testio-debug \ --enable-elf-shlibs \ --disable-libuuid \ - --enable-libblkid \ + --disable-libblkid \ --disable-uuidd \ --disable-tls \ --disable-nls \ - --disable-rpath + --disable-rpath \ + --disable-threads \ + --disable-fuse2fs define Build/Prepare $(call Build/Prepare/Default) @@ -139,7 +138,6 @@ define Build/Compile LDFLAGS=-Wl,--gc-sections \ BUILDCC="$(HOSTCC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \ ELF_OTHER_LIBS="$(TARGET_LDFLAGS) -luuid" \ SYSLIBS="$(TARGET_LDFLAGS) -ldl -L$(PKG_BUILD_DIR)/lib/ -l:libcom_err.so.0.0" \ V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \ |