libglib2: 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>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 62e29efef235525b79cc04b24d4f92d769f67b96..ea946ba05ee95245215480dc7f9b100cf1a042ec 100644 (file)
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBGLIB2
        depends on BR2_USE_WCHAR # gettext
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_LIBFFI
        select BR2_PACKAGE_PCRE

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 577dcecdc1234871ec349305b3d46783dc8ad22d..eeceeee86428af5aecd9567fdd5acbb7d8e82852 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -101,8 +101,8 @@ HOST_LIBGLIB2_CONF_OPTS = \
        --with-pcre=system
 
 LIBGLIB2_DEPENDENCIES = \
-       host-pkgconf host-libglib2 host-gettext \
-       libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
+       host-pkgconf host-libglib2 \
+       libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES)
 
 HOST_LIBGLIB2_DEPENDENCIES = \
        host-gettext \