From b3dd9a4b887fe7394dda7a09b49a6e2234d50b97 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 23:19:57 +0200 Subject: [PATCH] tpm-tools: 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 - dropping BR2_PACKAGE_GETTEXT selection Signed-off-by: Thomas Petazzoni --- package/tpm-tools/Config.in | 1 - package/tpm-tools/tpm-tools.mk | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/tpm-tools/Config.in b/package/tpm-tools/Config.in index 091f424a9a..e115687281 100644 --- a/package/tpm-tools/Config.in +++ b/package/tpm-tools/Config.in @@ -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 diff --git a/package/tpm-tools/tpm-tools.mk b/package/tpm-tools/tpm-tools.mk index c90edbb88c..4dbf50a298 100644 --- a/package/tpm-tools/tpm-tools.mk +++ b/package/tpm-tools/tpm-tools.mk @@ -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 -- 2.30.2