From bdef565cd6437d54f245563241e4a8e3f57fd489 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 3 Jul 2017 23:07:52 +0200 Subject: [PATCH] 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 --- package/pango/Config.in | 1 - package/pango/pango.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pango/Config.in b/package/pango/Config.in index 7813c4ebaf..dd2117aa4a 100644 --- 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 2f2d580959..7556f0ba85 100644 --- 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 \ -- 2.30.2