From cdc194883f1f3968cfd8d6683ce67f6c5bbbde84 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Jul 2017 12:26:53 +0200 Subject: [PATCH] exiv2: 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 - using BR2_SYSTEM_ENABLE_NLS instead of BR2_ENABLE_LOCALE to decide if NLS support should be enabled or not Signed-off-by: Thomas Petazzoni --- package/exiv2/exiv2.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk index 6bc88482c6..32029bab97 100644 --- a/package/exiv2/exiv2.mk +++ b/package/exiv2/exiv2.mk @@ -42,11 +42,10 @@ else EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF endif -ifeq ($(BR2_ENABLE_LOCALE),y) +EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) + +ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=ON -ifeq ($(BR2_PACKAGE_GETTEXT),y) -EXIV2_DEPENDENCIES += gettext -endif else EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=OFF endif -- 2.30.2