From d989cd7344c85894bb25c6e580e6b3a378867b3b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 12:28:00 +0200 Subject: [PATCH] coreutils: use the new gettext logic This commit uses TARGET_NLS_DEPENDENCIES instead of existing logic to add the dependency on gettext. To keep the existing behavior, we keep the --with-libintl-prefix option, but only when a libintl library is effectively provided by gettext. Signed-off-by: Thomas Petazzoni --- package/coreutils/coreutils.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 14b952f5a1..6a8a31b061 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -77,10 +77,11 @@ else COREUTILS_CONF_OPTS += --disable-xattr endif +COREUTILS_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) + # It otherwise fails to link properly, not mandatory though -ifeq ($(BR2_PACKAGE_GETTEXT),y) +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr -COREUTILS_DEPENDENCIES += gettext endif ifeq ($(BR2_PACKAGE_GMP),y)