Make all package using gettext rely on BR2_NEEDS_GETTEXT

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index 35b7c2785dcac5635f4934d786a76a52c8e0a583..338600515e90984550a708eb99d2a31578ea138a 100644 (file)
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AVAHI
        bool "avahi"
-       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          Avahi is a system which facilitates service
          discovery on a local network.

diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 9940d280d95b6f631c29abcc2d9f2f290fd49d18..5e64047b4bdb92a6e9e6f3d02f1c4bbbb6cc3184 100644 (file)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
                --with-autoipd-user=default \
                --with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-intltool
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon

diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index a8343617ee45763606497118d20eb66006ce7b4f..056f5a0779252f0484060e9118fd84efb0d47955 100644 (file)
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_GMPC
        bool "gmpc"
        depends on BR2_PACKAGE_LIBGTK2
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_LIBMPD
        select BR2_PACKAGE_LIBCURL

diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 0db89b90283c7447bb6b98d04e47c62ffcabae8a..aa74a2e2f2b3313cc711f7787ca75e8873bba3a8 100644 (file)
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -11,7 +11,8 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \
                ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPT = --disable-mmkeys
 
-GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool
+GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool \
+       $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
 GMPC_DEPENENCIES += xlib_libSM

diff --git a/package/grep/Config.in b/package/grep/Config.in
index 3795330cef6ab35fa26ba31939ed57ab79734e4b..f898fdf4abe74b727c43ee858ed94737d4ae3ac5 100644 (file)
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GREP
        bool "grep"
-       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          The GNU regular expression matcher.
 

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index acef6e9d2fe92e609c8f4171bf4f355c38dc23bc..93c6cafddde19b94bdf34d14178977164713ec65 100644 (file)
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -8,6 +8,6 @@ GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
 GREP_SITE:=$(BR2_GNU_MIRROR)/grep
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 
-GREP_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),gettext libintl)
+GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,grep))

diff --git a/package/hal/Config.in b/package/hal/Config.in
index 250e00509c005578de772bba0b2a375f6c7f3455..9518f1355f877e7aa6886f7f33ef8d33820f6a2c 100644 (file)
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_HAL
        bool "hal"
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_EXPAT

diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index 262fc41bcc97b69eb4d70d169273ae8f6622ee83..62eca704a446113b8ff626009114f80b725fc609 100644 (file)
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -79,7 +79,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
                rm -f $(TARGET_DIR)/usr/libexec/$$file; \
        done
 
-hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY)
 
 hal-clean:
        rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index d947eb67fe4084076a36a12038908d5c0ea56d9a..cc1d6e27bf9ee7c6712d08a8c871a3b12434d931 100644 (file)
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBGLIB2
        bool "libglib2"
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
          Low-level core library that forms the basis of GTK+ and GNOME.

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 72a13964538377061fd295a2225e93afa61b60bd..43b1a89004496cb45b377ea425ba7d872b0f568f 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -55,7 +55,7 @@ HOST_LIBGLIB2_CONF_OPT = \
                --disable-gtk-doc \
                --enable-debug=no \
 
-LIBGLIB2_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config
 

diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 6ee1a96982b30e336e794464c26679c24affa7f7..bc8e001403a67b920834b239308da953421d4ffe 100644 (file)
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
 LIBIDN_INSTALL_TARGET = YES
 LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
 LIBIDN_LIBTOOL_PATCH = NO
-LIBIDN_DEPENDENCIES = host-pkg-config gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(call AUTOTARGETS,package,libidn))
 

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 3829a81a24c2db49a24c459ce17e6c210a589966..45f62e8e4846825ceaea8c615da983f8f6963715 100644 (file)
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -26,6 +26,6 @@ LIBSOUP_CONF_OPT = \
        --without-gnome         \
        --disable-gtk-doc
 
-LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
 $(eval $(call AUTOTARGETS,package,libsoup))

diff --git a/package/make/Config.in b/package/make/Config.in
index 52640058eaaf638cd9ceeb4da153713f483f2f7d..674e245e9a41a4a54b9487ad54664309357edf21 100644 (file)
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MAKE
        bool "make"
-       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          A tool which controls the generation of executables and other
          non-source files of a program from the program's source files.

diff --git a/package/make/make.mk b/package/make/make.mk
index 29c7af45e19a29f866cbb695da3537c89725eb2d..5dd06379f1ca2c797c85860a6818dfe9a879e161 100644 (file)
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -56,7 +56,7 @@ $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
-make: $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
+make: $(if $(BR2_NEEDS_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
 
 make-clean:
        $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall

diff --git a/package/multimedia/libmpd/Config.in b/package/multimedia/libmpd/Config.in
index c79203c99f7efbe391d17ae59c51684c1821ef87..4f3a7144f0748ef8ba6bf2041c44fce776ad9367 100644 (file)
--- a/package/multimedia/libmpd/Config.in
+++ b/package/multimedia/libmpd/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_LIBMPD
        bool "libmpd"
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
          High-level client library for accessing Music Player Daemon.

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index 38e163e04dec1da41ab45eab73d7bae0436727b5..812a4c8721aa8ece575f4b6eb6611c493ae31ecd 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -45,7 +45,7 @@ HOST_PANGO_CONF_OPT = \
                $(if $(BR2_PACKAGE_XORG7),--with-x,--without-x) \
                --disable-debug \
 
-PANGO_DEPENDENCIES = gettext libintl host-pkg-config host-pango libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config host-pango libglib2 cairo
 
 HOST_PANGO_DEPENDENCIES = host-pkg-config host-cairo host-libglib2 host-autoconf host-automake
 

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 9b53e872b687042312507a32b30146e5a0149b05..2fbd05e8a483776d28800ea225577a76720da6d8 100644 (file)
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -67,7 +67,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
 
 config BR2_PACKAGE_PHP_EXT_GETTEXT
        bool "gettext"
-       select BR2_PACKAGE_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        help
          gettext support
 

diff --git a/package/php/php.mk b/package/php/php.mk
index cd5ed9e9e02a3f38592c33e1b46b95d3de9145eb..c5f9c140e0f15aa3deb04226669666ace0b79728 100644 (file)
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -84,7 +84,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
        PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
-       PHP_DEPENDENCIES += gettext
+       PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)

diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in
index e7ce7046192dc438cd3e3a5f16645f39a94601e4..31e982c6456eebeccb80ce9fd2b9d13a2b6a2245 100644 (file)
--- a/package/psmisc/Config.in
+++ b/package/psmisc/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_PSMISC
        bool "psmisc"
        select BR2_PACKAGE_NCURSES
-       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          Helpful /proc related utilities such as pstree, fuser, and killall
 

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index e04923d7554626a6538c860528def8d48c4ca2aa..b82883fa9b53438e53f5e7a81fbfb35854d057b5 100644 (file)
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -7,12 +7,6 @@ PSMISC_VERSION:=22.8
 PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz
 PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc
 PSMISC_AUTORECONF:=NO
-PSMISC_DEPENDENCIES:=ncurses
-
-ifeq ($(BR2_ENABLE_LOCALE),y)
-# psmisc gets confused and forgets to link with libintl
-PSMISC_MAKE_OPT:=LIBS=-lintl
-PSMISC_DEPENDENCIES+= gettext libintl
-endif
+PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,psmisc))

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 12d98f6bcc94295aefff0abf5d4563c43841e7e1..7ddd0c13a9bbc8a5ff6a0063facfb55665d2c9bf 100644 (file)
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_SSHFS
        bool "sshfs (FUSE)"
        select BR2_PACKAGE_LIBFUSE
        select BR2_PACKAGE_LIBGLIB2
-       select BR2_PACKAGE_GETTEXT
-       select BR2_PACKAGE_LIBINTL
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        depends on BR2_PACKAGE_OPENSSH
        help

diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 4acc2931e9f53c010e40a1ee40fb1b4e0504d561..d15aa00c26dd10bc0f9c9ebdbfbd314f9d0a45cf 100644 (file)
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -11,6 +11,6 @@ SSHFS_AUTORECONF:=NO
 SSHFS_INSTALL_STAGING:=NO
 SSHFS_INSTALL_TARGET:=YES
 
-SSHFS_DEPENDENCIES = libglib2 libfuse
+SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,sshfs))

diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index e21daf6cd452e5bc10640a6eb8cecc23713ef9db..533ef698b7cd675749ae41180e346a51c1c81a5b 100644 (file)
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_UTIL-LINUX
        bool "util-linux"
-       select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        depends on BR2_INET_RPC
        help
          Various useful/essential Linux utilities.

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index e2135e7d460add644596573752099577d2e926ac..6446d37b0abfa1d2ff39694c510e887f502fd626 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -18,8 +18,8 @@ else
 UTIL-LINUX_SCHED_UTILS:=--disable-schedutils
 endif
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-UTIL-LINUX_DEPENDENCIES += libintl
+ifeq ($(BR2_NEEDS_GETTEXT),y)
+UTIL-LINUX_DEPENDENCIES += gettext libintl
 UTIL-LINUX_MAKE_OPT = LIBS=-lintl
 endif