e2fsprogs: bump to 1.41.14 and fixup

Bump e2fsprogs to version 1.41.14

Also export libblkid properly for util-linux to use.

[Peter: install pkg-config files]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index f5258044df0f796eae0901c133da7b045b7b6ce3..cf1a6b857c8d1be0e71163f417fa9959e023d52f 100644 (file)
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -3,15 +3,10 @@
 # e2fsprogs
 #
 #############################################################
-E2FSPROGS_VERSION:=1.41.12
-E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
-E2FSPROGS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
-
-E2FSPROGS_AUTORECONF = NO
-E2FSPROGS_LIBTOOL_PATCH = NO
 
+E2FSPROGS_VERSION = 1.41.14
+E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
 E2FSPROGS_INSTALL_STAGING = YES
-E2FSPROGS_INSTALL_TARGET = YES
 
 E2FSPROGS_CONF_OPT = \
        --disable-tls \
@@ -112,11 +107,26 @@ endif
 
 define E2FSPROGS_STAGING_LIBUUID_INSTALL
        install -D $(@D)/lib/uuid/uuid.h $(STAGING_DIR)/usr/include/uuid/uuid.h
+       install -D $(@D)/lib/uuid/uuid.pc \
+               $(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
 endef
 
 ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBUUID),y)
 E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBUUID_INSTALL
 endif
 
+define E2FSPROGS_STAGING_LIBBLKID_INSTALL
+       install -D $(@D)/lib/blkid/blkid.h \
+               $(STAGING_DIR)/usr/include/blkid/blkid.h
+       install -D $(@D)/lib/blkid/blkid_types.h \
+               $(STAGING_DIR)/usr/include/blkid/blkid_types.h
+       install -D $(@D)/lib/blkid/blkid.pc \
+               $(STAGING_DIR)/usr/lib/pkgconfig/blkid.pc
+endef
+
+ifeq ($(BR2_PACKAGE_E2FSPROGS_LIBBLKID),y)
+E2FSPROGS_POST_INSTALL_STAGING_HOOKS += E2FSPROGS_STAGING_LIBBLKID_INSTALL
+endif
+
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
 $(eval $(call AUTOTARGETS,package,e2fsprogs,host))