tpm-tools: use the new gettext logic
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 3 Jul 2017 21:19:57 +0000 (23:19 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 4 Jul 2017 23:35:41 +0000 (01:35 +0200)
This commit switches to use the new gettext logic, which involves:

 - using TARGET_NLS_DEPENDENCIES instead of hand-encoded dependencies
   on gettext/host-gettext

 - dropping BR2_PACKAGE_GETTEXT selection

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/tpm-tools/Config.in
package/tpm-tools/tpm-tools.mk

index 091f424a9a118a86f67b794e35ae677bf11e3327..e11568728142d6aaf28d0f79157603e8a8dba6cb 100644 (file)
@@ -5,7 +5,6 @@ config BR2_PACKAGE_TPM_TOOLS
        depends on !BR2_arc # trousers
        select BR2_PACKAGE_TROUSERS
        select BR2_PACKAGE_OPENSSL
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Tools to manage and diagnose a TPM
 
index c90edbb88c9ff1e59b0a2d391e66dd48b198cdf5..4dbf50a298c8350ff34d17b1de5fa770b9d318c8 100644 (file)
@@ -9,8 +9,7 @@ TPM_TOOLS_SITE = http://downloads.sourceforge.net/project/trousers/tpm-tools/$(T
 TPM_TOOLS_STRIP_COMPONENTS = 2
 TPM_TOOLS_LICENSE = Common Public License Version 1.0
 TPM_TOOLS_LICENSE_FILES = LICENSE
-TPM_TOOLS_DEPENDENCIES = trousers openssl \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+TPM_TOOLS_DEPENDENCIES = trousers openssl $(TARGET_NLS_DEPENDENCIES)
 # configure.in and lib/Makefile.am is patched
 TPM_TOOLS_AUTORECONF = YES
 TPM_TOOLS_GETTEXTIZE = YES