From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 28 Jun 2013 11:26:51 +0000 (+0000)
Subject: e2fsprogs: use the private version of blkid statically, it is significantly smaller... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d383212f81bd38ab9dfab83533d1d6d46ec4e36d;p=openwrt%2Fstaging%2Fjow.git

e2fsprogs: use the private version of blkid statically, it is significantly smaller than the external shared libblkid

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 37065
---

diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
index ebc21c9067..783648cf63 100644
--- a/package/utils/e2fsprogs/Makefile
+++ b/package/utils/e2fsprogs/Makefile
@@ -30,7 +30,7 @@ $(call Package/e2fsprogs/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ext2/3/4 filesystem utilities
-  DEPENDS:=+libblkid +libuuid +libext2fs
+  DEPENDS:=+libuuid +libext2fs
 endef
 
 define Package/e2fsprogs/description
@@ -86,7 +86,7 @@ TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
 	--enable-elf-shlibs	\
 	--disable-libuuid	\
-	--disable-libblkid	\
+	--enable-libblkid	\
 	--disable-uuidd		\
 	--disable-tls		\
 	--disable-nls		\
@@ -107,6 +107,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		BUILDCC="$(HOSTCC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \
 		all
 endef