diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 22:40:58 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:27:24 +0200 |
| commit | eaf232dbd01b5946c46f0991befa5339c4b4bad0 (patch) | |
| tree | af595e2b5132e347aac55f5dde2b28057a6e3d03 | |
| parent | d989cd7344c85894bb25c6e580e6b3a378867b3b (diff) | |
| download | buildroot-eaf232dbd01b5946c46f0991befa5339c4b4bad0.tar.gz buildroot-eaf232dbd01b5946c46f0991befa5339c4b4bad0.zip | |
cryptsetup: use new gettext logic
This commit switches to use the new gettext logic, which involves:
- using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
on gettext/host-gettext
- using TARGET_NLS_LIBS to force linking against libintl
- dropping BR2_PACKAGE_GETTEXT selection
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/cryptsetup/Config.in | 1 | ||||
| -rw-r--r-- | package/cryptsetup/cryptsetup.mk | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index 3ca23ba721..5cd4676eaa 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_LVM2 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 787331c14a..5496583028 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -9,14 +9,11 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).5 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_INSTALL_STAGING = YES - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl" -endif +CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL # or kernel crypto modules instead |
