diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-03 22:55:18 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-05 01:28:44 +0200 |
| commit | aa9a082a3df897ea1126cff24f86bc0214bc8f4d (patch) | |
| tree | 3091152b94f2ff4324ddd1bf47615eaf3126bc13 | |
| parent | 3430b9997c1aedda4cfbbfe5ebd043d98297d0bc (diff) | |
| download | buildroot-aa9a082a3df897ea1126cff24f86bc0214bc8f4d.tar.gz buildroot-aa9a082a3df897ea1126cff24f86bc0214bc8f4d.zip | |
linux-pam: use the 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/linux-pam/Config.in | 1 | ||||
| -rw-r--r-- | package/linux-pam/linux-pam.mk | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in index ab7cf55952..33e515434b 100644 --- a/package/linux-pam/Config.in +++ b/package/linux-pam/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_LINUX_PAM depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_MUSL depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_FLEX help A Security Framework that Provides Authentication for Applications diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk index fb2f99cb1f..5c80e78416 100644 --- a/package/linux-pam/linux-pam.mk +++ b/package/linux-pam/linux-pam.mk @@ -16,15 +16,12 @@ LINUX_PAM_CONF_OPTS = \ --disable-regenerate-docu \ --enable-securedir=/lib/security \ --libdir=/lib -LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf +LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \ + $(TARGET_NLS_DEPENDENCIES) LINUX_PAM_AUTORECONF = YES LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE_FILES = Copyright - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LINUX_PAM_DEPENDENCIES += gettext -LINUX_PAM_MAKE_OPTS += LIBS=-lintl -endif +LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBSELINUX),y) LINUX_PAM_CONF_OPTS += --enable-selinux |
