cryptsetup: Add libintl for UCLIBC toolchain
PATCH v3 1/1 cryptsetup: Add libintl for UCLIBC toolchain
Fixes autobuild error
http://autobuild.buildroot.net/results/cc1a65b9554bc2ece1b3ea8b51cd805b9bda7e86/
Adding libintl to the libraries list for cryptsetup when using a uclibc toolchain and locale support is enabled.
---
Changes v2 -> v3:
- Adding BR2_NEEDS_GETTEXT_IF_LOCALE checks per the buildroot manual (suggested by Gustavo)
Changes v1 -> v2:
- Adding TARGET_LDFLAGS to make sure they are not dropped
--- package/cryptsetup/Config.in | 1 + package/cryptsetup/cryptsetup.mk | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
package/cryptsetup/Config.in +1 -0
@@ -4,6 +4,7 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_POPT select BR2_PACKAGE_LVM2 select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE depends on BR2_LARGEFILE # lvm2, util-linux depends on BR2_USE_MMU # lvm2 depends on BR2_USE_WCHAR # util-linux
package/cryptsetup/cryptsetup.mk +6 -1
@@ -8,8 +8,13 @@ CRYPTSETUP_VERSION = 1.6.2 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.bz2 CRYPTSETUP_SITE = http://cryptsetup.googlecode.com/files CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf +CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs libgcrypt host-pkgconf \ + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) +CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl" +endif + $(eval $(autotools-package))
Signature · 1 line
1.7.9.5
Thomas Petazzoni
AppliedPATCH v3 1/1 cryptsetup: Add libintl for UCLIBC toolchain
Dear Clayton Shotwell,
Quoted 13 lines · Clayton Shotwell
Fixes autobuild error
http://autobuild.buildroot.net/results/cc1a65b9554bc2ece1b3ea8b51cd805b9bda7e86/Adding libintl to the libraries list for cryptsetup when using a uclibc toolchain and locale support is enabled.
Signed-off-by Clayton Shotwell <[email protected]>---
Changes v2 -> v3:
- AddingBR2_NEEDS_GETTEXT_IF_LOCALEchecks per the buildroot manual (suggested by Gustavo)
Changes v1 -> v2:
- AddingTARGET_LDFLAGSto make sure they are not dropped
Quoted 4 lines
--- package/cryptsetup/Config.in | 1 + package/cryptsetup/cryptsetup.mk | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
Applied to for-peter-2013.11, thanks.
Note that this patch is really a workaround for what is a deficiency of the package itself. The configure.ac script properly detects that it's not the C library that provides intl support, but the separate libintl library. However, src/Makefile.am fails to add the proper @LIBINTL@ string to the _LDADD of the program that uses intl features. See the end of
http://www.gnu.org/software/gettext/manual/html_node/src_002fMakefile.html
for details about this.
If you're interested, don't hesitate to report this problem upstream.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com