Skip to contentSkip to conversation

mtd: fix static build with uuid

PATCH Superseded Baruch Siach 2 participants 2 messages Sep 10, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

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

Cc Vicente Olivert Riera <[email protected]>
---
 package/mtd/mtd.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/mtd/mtd.mk +7 -1
index 0fb9fc2c1acc..c2cb9377d570 100644
@@ -16,8 +16,14 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif
 
+MTD_MKFSUBIFS_LIBS = $(shell $(PKG_CONFIG_HOST_BINARY) --libs uuid)
+
 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%$$% $(MTD_MKFSUBIFS_LIBS)%' $(@D)/Makefile
+endef
+MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL
 endif
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
Signature · 1 line
2.5.1
#1 lore raw

PATCH 1/1 mtd: fix static build with uuid

Quoted 20 lines · Baruch Siach

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.

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

Cc Vicente Olivert Riera <[email protected]>
---
 package/mtd/mtd.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/mtd/mtd.mk +0 -0
index 0fb9fc2c1acc..c2cb9377d570 100644

package/mtd/mtd.mk ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) · line 19

Quoted 4 lines
package/mtd/mtd.mk +1 -0
@@ -16,8 +16,14 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 MTD_DEPENDENCIES = zlib lzo
 endif
 
+MTD_MKFSUBIFS_LIBS = $(shell $(PKG_CONFIG_HOST_BINARY) --libs uuid)

I recently replaced all $(shell ...) instances with backticks. See
http://git.buildroot.org/buildroot/commit/?id=7d69a79624b1f3 for an explanation why.

package/mtd/mtd.mk ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) · line 24

Quoted 6 lines
package/mtd/mtd.mk +4 -1
+
 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%$$% $(MTD_MKFSUBIFS_LIBS)%' $(@D)/Makefile

Of course that means you have to use " instead of ' here, else the backtick
isn't expanded.

Regards,
Arnout

Quoted 6 lines
package/mtd/mtd.mk +2 -0
+endef
+MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL
 endif
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF