Commit 6ed31767 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

package/parted: fix static link 

libuuid needs to be linked with -lintl when gettext is needed (with
locales).

For a shared build, this is solved with the DT_NEEDED ELF tags, but for
a static link, it is not pulled in automatically.

Use pkg-config to find libuuid, instead of AC_CHECK_LIB().

Second part at fixing:
    http://autobuild.buildroot.net/results/c46/c467aeec258909bb82eda77123803944f97d8df8/



[Peter: add host-pkgconf to _DEPENDENCIES]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent a535a0ea

package/parted/parted-003-fix-static-link-uuid.patch

0 → 100644
+48 −0
Original line number Diff line number Diff line 
configure: use pkg-config to find libuuid



In some conditions, libuuid may be linked with -lintl. This can be the

case on uClibc when locales are enabled.



When doing a shared link, this dependency is automatically pulled in via

a DT_NEEDED ELF tag



For a static link, there is no such mechanism to pull in dependent

libraries.



Currently, the check for libuuid is done with AC_CHECK_LIB, but this

does not handle dependencies, and thus a stattic build fails.



Use pkg-config to find libuuid, that automatically pulls in the

dependencies of libuuid, if any.



Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>



---

Note: of course, that relies on the fact that libuuid installs a proper

.pc file; a patch will be submitted upstream shortly.



But even considering the current situation, where libuuid does not

provide a proper .pc file (yet), this patch does not change the

behaviour we've had so far; it is a bet on the future! ;-)



diff -durN parted-3.1.orig/configure.ac parted-3.1/configure.ac

--- parted-3.1.orig/configure.ac	2014-11-29 16:27:49.520560137 +0100

+++ parted-3.1/configure.ac	2014-11-29 16:32:50.799702049 +0100

@@ -313,16 +313,7 @@

 AC_SUBST([DL_LIBS])

 

 dnl Check for libuuid

-UUID_LIBS=""

-AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS="-luuid"],

-	[AC_MSG_ERROR(dnl

-[GNU Parted requires libuuid - a part of the util-linux-ng package (but

-usually distributed separately in libuuid-devel, uuid-dev or similar)

-This can probably be found on your distribution's CD or FTP site or at:

-    http://userweb.kernel.org/~kzak/util-linux-ng/

-Note: originally, libuuid was part of the e2fsprogs package.  Later, it

-moved to util-linux-ng-2.16, and that package is now the preferred source.])])

-AC_SUBST([UUID_LIBS])

+PKG_CHECK_MODULES([UUID],[uuid])

 

 dnl Check for libdevmapper

 DM_LIBS=

package/parted/parted.mk

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
PARTED_VERSION = 3.1

PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz

PARTED_SITE = $(BR2_GNU_MIRROR)/parted

PARTED_DEPENDENCIES = util-linux

PARTED_DEPENDENCIES = host-pkgconf util-linux

PARTED_INSTALL_STAGING = YES

# For uclinux patch

PARTED_AUTORECONF = YES
@@ -33,7 +33,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y) 
PARTED_CONF_OPTS += --disable-dynamic-loading

endif



HOST_PARTED_DEPENDENCIES = host-util-linux

HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux

HOST_PARTED_CONF_OPTS += \

	--without-readline \

	--disable-device-mapper \