summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-03 23:25:22 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-05 01:36:54 +0200
commit5ceabb945d9ce32a7b94f942fa062ffa615f1047 (patch)
tree0844fb866cd60ec35d71f07818f8e155bd8d1f0a
parente398ec92e9ad04e5bbae32f03cd18a53b5761517 (diff)
downloadbuildroot-5ceabb945d9ce32a7b94f942fa062ffa615f1047.tar.gz
buildroot-5ceabb945d9ce32a7b94f942fa062ffa615f1047.zip
xscreensaver: 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/xscreensaver/Config.in1
-rw-r--r--package/xscreensaver/xscreensaver.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in
index 5213ce3695..032eab2ae3 100644
--- a/package/xscreensaver/Config.in
+++ b/package/xscreensaver/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_XSCREENSAVER
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
help
XScreenSaver is the standard screen saver collection shipped on most
Linux and Unix systems running the X11 Window System.
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 77c37a9e98..34b116387b 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -12,7 +12,7 @@ XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
- $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool
+ $(TARGET_NLS_DEPENDENCIES) host-intltool
# otherwise we end up with host include/library dirs passed to the
# compiler/linker
OpenPOWER on IntegriCloud