summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-26 10:45:04 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-26 10:59:42 +0200
commitee790bf78097cee1cf132d3c8b279dfe2fee388e (patch)
tree9738361a589a1c57d0e22773d8e85f7051546ff6
parentfdbb45e6e88e49ceada4025ae893104160b4765a (diff)
e2fsprogs: update to 1.43.4, fix Darwin cross-compile issue via --enable-verbose-makecmds removal
-rw-r--r--package/e2fsprogs/Makefile11
-rw-r--r--package/e2fsprogs/patches/patch-e2fsck_Makefile_in11
2 files changed, 5 insertions, 17 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 692c8ded8..f7ca2fd35 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.43.3
+PKG_VERSION:= 1.43.4
PKG_RELEASE:= 1
-PKG_HASH:= 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37
+PKG_HASH:= 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24
PKG_DESCR:= ext2/3/4 filesystem utilities
PKG_SECTION:= sys/fs
PKG_BUILDDEP:= util-linux
@@ -27,9 +27,9 @@ PKGSD_LIBCOM_ERR:= common error library
PKGSC_LIBCOM_ERR:= libs/misc
PKGSD_LIBSS:= subsystem command parsing library
PKGSC_LIBSS:= libs/misc
-PKGSD_E2FSCK_STATIC:= Static build of e2fsck
+PKGSD_E2FSCK_STATIC:= static build of e2fsck
PKGSC_E2FSCK_STATIC:= sys/fs
-PKGSD_TUNE2FS_STATIC:= Static build of tune2fs
+PKGSD_TUNE2FS_STATIC:= static build of tune2fs
PKGSC_TUNE2FS_STATIC:= sys/fs
PKGSD_RESIZE2FS:= ext2/3/4 resize utility
PKGSC_RESIZE2FS:= sys/fs
@@ -76,8 +76,7 @@ CONFIGURE_ARGS+= --disable-rpath \
--disable-defrag \
--disable-libblkid \
--disable-libuuid \
- --disable-debugfs \
- --enable-verbose-makecmds
+ --disable-debugfs
TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
MAKE_FLAGS+= BUILD_CC="$(HOST_CC)" \
BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
diff --git a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
deleted file mode 100644
index 8e1efb15e..000000000
--- a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- e2fsprogs-1.43.2.orig/e2fsck/Makefile.in 2016-06-07 07:01:19.000000000 +0200
-+++ e2fsprogs-1.43.2/e2fsck/Makefile.in 2016-09-19 13:19:14.000000000 +0200
-@@ -115,7 +115,7 @@ e2fsck: $(OBJS) $(DEPLIBS)
-
- e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
- $(E) " LD $@"
-- $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
-+ $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
-
- e2fsck.profiled: $(OBJS) $(PROFILED_DEPLIBS)
- $(E) " LD $@"