From: Baruch Siach <baruch@tkos.co.il>
Date: Fri, 11 Sep 2015 04:08:37 +0000 (+0300)
Subject: mtd: fix static build with uuid
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bfcf697712e5b636d755751ac0f69afed253f46a;p=buildroot.git

mtd: fix static build with uuid

The uuid library might depend on gettext. Use pkg-config to discover uuid
dependencies at build time, and edit Makefile accordingly to avoid missing
symbols when linking statically.

Based on a patch from Vicente Olivert Riera.

Fixes:
http://autobuild.buildroot.net/results/2dd/2ddd714446d9eb75701bd48c117dc5bbbd291a76/
http://autobuild.buildroot.net/results/3af/3af4ef252c8cb2b22134d91ce48e5930c60ec437/
http://autobuild.buildroot.net/results/648/648341fce974e8f016eee57c95d7511a886eef49/

[Peter: drop MTD_MKFSUBIFS_LIBS variable]
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Tested-by: Gergely Imreh <imrehg@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 0fb9fc2c1a..adbf28d8f6 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -17,7 +17,12 @@ MTD_DEPENDENCIES = zlib lzo
 endif
 
 ifeq ($(BR2_PACKAGE_MTD_MKFSUBIFS),y)
-MTD_DEPENDENCIES += util-linux zlib lzo
+MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf
+define MTD_ADD_MISSING_LINTL
+	$(SED) "/^LDLIBS_mkfs\.ubifs/ s%$$% `$(PKG_CONFIG_HOST_BINARY) --libs uuid`%" \
+		$(@D)/Makefile
+endef
+MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL
 endif
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)