pango: 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 <thomas.petazzoni@free-electrons.com>

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 7813c4ebaff667f009aaf214598de1adc6c4c967..dd2117aa4ad9b1de0129c8c5cd89b2db6822361f 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_PANGO
        select BR2_PACKAGE_FONTCONFIG
        select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_HARFBUZZ
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
        help
          Pango is a library for laying out and rendering of text, with an

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 2f2d580959511c6064d8af1144e36ff8c3f54d3b..7556f0ba8554ead7ab54344338cb962a091abe0a 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -17,7 +17,7 @@ PANGO_CONF_OPTS = --enable-explicit-deps=no
 HOST_PANGO_CONF_OPTS = --enable-explicit-deps=no
 
 PANGO_DEPENDENCIES = \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+       $(TARGET_NLS_DEPENDENCIES) \
        host-pkgconf \
        libglib2 \
        cairo \