summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-03 22:59:46 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-05 01:28:45 +0200
commit2864f9047d19fda2626b2db69d9cc3d8f205606b (patch)
tree822869561d23bbab9d14f84363e9a1fe1b3a9a5e
parent1fe1b6372697bac48bf549e543d486c54284d027 (diff)
downloadbuildroot-2864f9047d19fda2626b2db69d9cc3d8f205606b.tar.gz
buildroot-2864f9047d19fda2626b2db69d9cc3d8f205606b.zip
midori: 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>
-rw-r--r--package/midori/Config.in1
-rw-r--r--package/midori/midori.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 4d30c83066..43ba45e801 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -21,7 +21,6 @@ config BR2_PACKAGE_MIDORI
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_WEBKITGTK
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Midori is a lightweight web browser based on WebKit
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 395e72ec2f..1755f1241a 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -22,7 +22,7 @@ MIDORI_DEPENDENCIES = \
libxml2 \
sqlite \
webkitgtk \
- $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+ $(TARGET_NLS_DEPENDENCIES) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
MIDORI_CONF_OPTS = \
OpenPOWER on IntegriCloud