[Buildroot] [PATCH v2] mtd: fix static build with uuid

Peter Korsgaard peter at korsgaard.com
Sun Sep 13 20:46:05 UTC 2015


>>>>> "Baruch" == Baruch Siach <baruch at tkos.co.il> writes:

 > 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/

 > Cc: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
 > Signed-off-by: Baruch Siach <baruch at tkos.co.il>
 > ---
 > v2:
 >    * Use backticks instead of $(shell ...) make function (Arnout)
 > ---
 >  package/mtd/mtd.mk | 8 +++++++-
 >  1 file changed, 7 insertions(+), 1 deletion(-)

 > diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
 > index 0fb9fc2c1acc..89cfac15756a 100644
 > --- a/package/mtd/mtd.mk
 > +++ b/package/mtd/mtd.mk
 > @@ -16,8 +16,14 @@ ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
 >  MTD_DEPENDENCIES = zlib lzo
 >  endif
 
 > +MTD_MKFSUBIFS_LIBS = `$(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

The helper variable is only used once, so I've removed it and directly
added the pkg-config call here.

Committed, thanks.

With that said, it would be good to get upstream to use pkg-config
directly.

-- 
Bye, Peter Korsgaard


More information about the buildroot mailing list