jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-pam: use the new gettext logic

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2017-07-03 22:55:18 +02:00
parent 3430b9997c
commit aa9a082a3d
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/linux-pam/Config.in
View File

@ -4,7 +4,6 @@ config BR2_PACKAGE_LINUX_PAM
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_USES_MUSL
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_FLEX select BR2_PACKAGE_FLEX
help help
A Security Framework that Provides Authentication for Applications A Security Framework that Provides Authentication for Applications

9
package/linux-pam/linux-pam.mk
View File

@ -16,15 +16,12 @@ LINUX_PAM_CONF_OPTS = \
--disable-regenerate-docu \ --disable-regenerate-docu \
--enable-securedir=/lib/security \ --enable-securedir=/lib/security \
--libdir=/lib --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_AUTORECONF = YES
LINUX_PAM_LICENSE = BSD-3-Clause LINUX_PAM_LICENSE = BSD-3-Clause
LINUX_PAM_LICENSE_FILES = Copyright LINUX_PAM_LICENSE_FILES = Copyright
LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
LINUX_PAM_DEPENDENCIES += gettext
LINUX_PAM_MAKE_OPTS += LIBS=-lintl
endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y) ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
LINUX_PAM_CONF_OPTS += --enable-selinux LINUX_PAM_CONF_OPTS += --enable-selinux