json-glib: 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/json-glib/Config.in b/package/json-glib/Config.in
index ea15295b382508b3809a0000373ccc101edcf054..9df03d924abfbd0429dcf4e4442dc48007bfec32 100644 (file)
--- a/package/json-glib/Config.in
+++ b/package/json-glib/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_JSON_GLIB
        depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_USE_MMU # glib2
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        help
          JSON-GLib is a library providing serialization and
          deserialization support for the JavaScript Object Notation

diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk
index db22dc9a78e33552d21fe97679ace0ac132b54ca..5ee43d9a123171749d8c26ea7312ac91b341e7b3 100644 (file)
--- a/package/json-glib/json-glib.mk
+++ b/package/json-glib/json-glib.mk
@@ -13,7 +13,7 @@ JSON_GLIB_LICENSE_FILES = COPYING
 JSON_GLIB_INSTALL_STAGING = YES
 
 JSON_GLIB_DEPENDENCIES = \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+       $(TARGET_NLS_DEPENDENCIES) \
        host-pkgconf \
        libglib2