Просмотр исходного кода

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 <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 8 лет назад
Родитель
Сommit
d989cd7344
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      package/coreutils/coreutils.mk

+ 3 - 2
package/coreutils/coreutils.mk

@@ -77,10 +77,11 @@ else
 COREUTILS_CONF_OPTS += --disable-xattr
 COREUTILS_CONF_OPTS += --disable-xattr
 endif
 endif
 
 
+COREUTILS_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
+
 # It otherwise fails to link properly, not mandatory though
 # 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_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr
-COREUTILS_DEPENDENCIES += gettext
 endif
 endif
 
 
 ifeq ($(BR2_PACKAGE_GMP),y)
 ifeq ($(BR2_PACKAGE_GMP),y)