Remove all references to libintl

From now on, packages only need to select the BR2_PACKAGE_GETTEXT
option and depend on the 'gettext' package to get the necessary i18n
libraries installed on the target.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/avahi/Config.in b/package/avahi/Config.in
index eb3ccb67b05df6d12dc717dc002465619a533ac5..8ba33d5e70222a22d5c73071427c2493785978f9 100644 (file)
--- a/package/avahi/Config.in
+++ b/package/avahi/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_AVAHI
        bool "avahi"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        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 a26481d4eb779a96434054309153d4dbf2e50a0f..03dc36859ff50384670f6fbf71df83d1a18c7c7f 100644 (file)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -85,7 +85,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
                --with-autoipd-user=default \
                --with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool host-pkg-config
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool host-pkg-config
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
@@ -133,8 +133,8 @@ else
 AVAHI_CONF_OPT += --disable-python
 endif
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-AVAHI_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+AVAHI_DEPENDENCIES += gettext
 AVAHI_MAKE_OPT = LIBS=-lintl
 endif
 

diff --git a/package/axel/Config.in b/package/axel/Config.in
index 98f494109688e1a7b3656dab8041425d14e28abd..d8232725c2a8072e6b1bbc7025b127a1a1931144 100644 (file)
--- a/package/axel/Config.in
+++ b/package/axel/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_AXEL
        bool "axel"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          HTTP/FTP download accelerator.

diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 893caf1248a904431ee3ee0e8669db02062a8fdf..0ed8ad2e1c6dd5d1477e9eb51928ff230be2d9f3 100644 (file)
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -10,7 +10,7 @@ AXEL_SITE = https://alioth.debian.org/frs/download.php/3015
 AXEL_LDFLAGS = -lpthread
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-AXEL_DEPENDENCIES += gettext libintl
+AXEL_DEPENDENCIES += gettext
 AXEL_LDFLAGS += -lintl
 endif
 

diff --git a/package/binutils/Config.in b/package/binutils/Config.in
index e068b20d4047d02b8f583c32cd02682386150cfd..64803706e37d51a80b0b3d4f229576219ab6a9ae 100644 (file)
--- a/package/binutils/Config.in
+++ b/package/binutils/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_BINUTILS
        bool "binutils"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Install binutils on the target
 

diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index a91879a7012a68ef0fbd62c5e8f82513b9c1a935..d41cac4e9c0938a3958837b081625c86ce9c84c0 100644 (file)
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -23,7 +23,7 @@ BINUTILS_SITE = ftp://www.at91.com/pub/buildroot
 endif
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
-BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # We need to specify host & target to avoid breaking ARM EABI
 BINUTILS_CONF_OPT = --disable-multilib --disable-werror \

diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index d6029a4e60ca5a78b24088dce36813a2065dec91..168d0402485bd35235003b783cfe6b57aff5d438 100644 (file)
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -7,8 +7,7 @@
 DIFFUTILS_VERSION = 3.2
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = \
-       $(if $(BR2_PACKAGE_GETTEXT),gettext) \
-       $(if $(BR2_PACKAGE_LIBINTL),libintl)
+       $(if $(BR2_PACKAGE_GETTEXT),gettext)
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index e67aa461708d995818b471a0859ca455432c60b4..b76ddb2cc36498bca19a7a2c2302fb467532f2d6 100644 (file)
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -25,7 +25,6 @@ config BR2_PACKAGE_DNSMASQ_IDN
        depends on BR2_USE_WCHAR
        select BR2_PACKAGE_LIBIDN
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Enable IDN support in dnsmasq.
          This option is a big space taker since it pulls in many libraries.

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 1f714bf577e98cba0f402d8d4ddee3f9bae6a277..e92a554acec980be453018e608ce4763088ad07d 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -24,7 +24,7 @@ endif
 
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-       DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+       DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
        DNSMASQ_MAKE_OPT += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
        DNSMASQ_COPTS += -DHAVE_IDN
        DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)

diff --git a/package/flex/flex.mk b/package/flex/flex.mk
index 16f680176933c39748f5752dad368344cfb9db92..2599cdc75f01534d72319b90c6e151a0e65b8b48 100644 (file)
--- a/package/flex/flex.mk
+++ b/package/flex/flex.mk
@@ -12,8 +12,7 @@ FLEX_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
 FLEX_DIR = $(BUILD_DIR)/flex-$(FLEX_VERSION)
 FLEX_INSTALL_STAGING = YES
 FLEX_DEPENDENCIES = \
-       $(if $(BR2_PACKAGE_GETTEXT),gettext) \
-       $(if $(BR2_PACKAGE_LIBINTL),libintl)
+       $(if $(BR2_PACKAGE_GETTEXT),gettext)
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES =
 

diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 28a0f12c1a9e748d18247dfa5c28291c7c993d5f..33b5f7c86256bc2d7df919b3139a1b8bbdff9201 100644 (file)
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_GDK_PIXBUF
        depends on BR2_USE_WCHAR # glib2
        select BR2_PACKAGE_LIBGLIB2
        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
          Gdk-Pixbuf is an image loader and scaler. It uses GObject

diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 0d9e20600a63a355fe4d270abcda34781ea662bc..92a34bfcf2c09cedf84d9a2de317b5f59a7e445a 100644 (file)
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,7 +40,7 @@ GDK_PIXBUF_DEPENDENCIES += xlib_libX11
 endif
 
 GDK_PIXBUF_DEPENDENCIES += \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
        $(if $(BR2_ENABLE_LOCALE),,libiconv) \
        host-pkg-config libglib2
 

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 04f7de673c19bb606bc9ce6da8de813cc094768c..de19410003ab55010c7968c09e594cb9d55eaea7 100644 (file)
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -15,7 +15,3 @@ config BR2_PACKAGE_GETTEXT
 
 comment "gettext requires a toolchain with WCHAR support"
        depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
-
-config BR2_PACKAGE_LIBINTL
-       bool
-       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in
index 16f0d4a22f066e370c1088cb05cc3fccb8d72755..dab35eaba2dc387eb9de726368c78fa730e5295f 100644 (file)
--- a/package/glib-networking/Config.in
+++ b/package/glib-networking/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_GLIB_NETWORKING
        depends on BR2_USE_WCHAR # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          Network-related GIO modules for glib.
 

diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index 385ad47fc777609765edac444e980dd08a71dd9d..823ba39486d086145dc279b3800da3e9e95a0e64 100644 (file)
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -13,7 +13,7 @@ GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 GLIB_NETWORKING_INSTALL_STAGING = YES
 
 GLIB_NETWORKING_DEPENDENCIES = \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
        host-pkg-config \
        host-intltool \
        libglib2

diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index f86945c9e887311e18838f83cd88cf85cec6479c..9b38d1a4f089a16fe9eba331932217625ed3c372 100644 (file)
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_GMPC
        depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_LIBMPD
        select BR2_PACKAGE_LIBSOUP

diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 51d0cd95360d1281c42ff2b1d7f5ede251a84b4a..a136cf4fe137d05889bffe0dcc9d9b18e0ac4477 100644 (file)
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -11,6 +11,6 @@ GMPC_CONF_OPT = --disable-mmkeys --disable-unique
 GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkg-config host-vala \
        libglib2 libgtk2 libmpd libsoup sqlite \
        xlib_libICE xlib_libSM xlib_libX11 \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 $(eval $(autotools-package))

diff --git a/package/grep/Config.in b/package/grep/Config.in
index 1b39922fcad217a1f2ac491dd74d4f7036f4ddc7..5906e698af8f049bb8b2c61f8a487f2f5787a9fe 100644 (file)
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GREP
        bool "grep"
        depends on BR2_USE_WCHAR
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          The GNU regular expression matcher.
 

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index a02fe2c92b82c9be487d79608e03a86f720a5579..2636c83b784a81a7d9724c1d09668bcc5574de68 100644 (file)
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -10,7 +10,7 @@ GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPLv3+
 GREP_LICENSE_FILES = COPYING
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
-GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # link with iconv if enabled
 ifeq ($(BR2_PACKAGE_LIBICONV),y)

diff --git a/package/kbd/Config.in b/package/kbd/Config.in
index a23b70a81f0e08cd65128a543f8df66e68407841..44c31633888f8ac1946592e8b49b8582ccd4f6f4 100644 (file)
--- a/package/kbd/Config.in
+++ b/package/kbd/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_KBD
        bool "kbd"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        # Uses fork()
        depends on BR2_USE_MMU
        help

diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index a52ad5ac7f26570321a2462388aaffa2e5524380..325978e6ccf73dc958de4f48913f3d52e2031aa8 100644 (file)
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -2,6 +2,6 @@ KBD_VERSION = 1.15.2
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.gz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 
-KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 $(eval $(autotools-package))

diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index d1d7231b00915c0a9edf1a6739b92d1ce09e1233..5282885b8b6ef6a5f3ad44ea8a397de24555d673 100644 (file)
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBGLIB2
        bool "libglib2"
        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_LIBFFI
        select BR2_PACKAGE_ZLIB

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 2b2bd32f5f2e5934bf9d388bba6b3027812209b8..030cecbc236942e7192637607515ec3dc8208dca 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 = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
 
 HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-libffi host-zlib
 

diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index f40625d4878f86c18cf3598b7a04b1ff8714f92c..57b425f283aaefb9975391cdb7d1338062118615 100644 (file)
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_LIBSOUP
        select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
        help
          libsoup is an HTTP client/server library. It uses GObject
          and the GLib main loop, to integrate well with GNOME

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index fe1a41c6ecd7e922aaf9049156b26488c43b474b..30655ba303e0f9504dcac22e605f0c56a513c0f2 100644 (file)
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -19,7 +19,7 @@ endif
 
 LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
 
-LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config host-libglib2 libglib2 libxml2
 
 ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
 LIBSOUP_DEPENDENCIES += glib-networking

diff --git a/package/linux-pam/Config.in b/package/linux-pam/Config.in
index 722b87576d29b13a13bb1c54c1deb4538b9e20a4..7cfd8147a546d01533622c0b55708aa5247845ee 100644 (file)
--- a/package/linux-pam/Config.in
+++ b/package/linux-pam/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LINUX_PAM
        bool "linux-pam"
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_FLEX
        select BR2_PACKAGE_FLEX_LIBFL

diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index 48cb073943bc6cdfcc238c529aa7f2f50dac0ef1..1a2e7f6bf73c1792e48774e64f0997ff15a0829b 100644 (file)
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -15,12 +15,12 @@ LINUX_PAM_CONF_OPT = \
        --disable-regenerate-docu \
        --enable-securedir=/lib/security \
        --libdir=/lib
-LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) flex
+LINUX_PAM_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) flex
 LINUX_PAM_AUTORECONF = YES
 LINUX_PAM_LICENSE = BSD-3c
 LINUX_PAM_LICENSE_FILES = Copyright
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
        LINUX_PAM_MAKE_OPT += LIBS=-lintl
 endif
 

diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index a53c1073ee0a7aa859f66f523174cf80186277ef..68daa0d5f3d6c59de2a3700eaf0f46affa3d3162 100644 (file)
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -9,7 +9,7 @@ LSHW_SITE = http://ezix.org/software/files
 LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
        RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
 LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT),-lintl)"
-LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),libintl)
+LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext)
 
 define LSHW_BUILD_CMDS
        $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)

diff --git a/package/make/Config.in b/package/make/Config.in
index 364bb1e18af45c2c5c79f924874e7eddd8fcd286..ea2ae1b58b39c1c14a3fbd41b14ded2cc27c2c9c 100644 (file)
--- a/package/make/Config.in
+++ b/package/make/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MAKE
        bool "make"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        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 a0981c7181eb6a5fec7f9c7509a7a700ae38624a..02b2741fd802fc68b1b9c70df9c8054fbe3cbbe1 100644 (file)
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -7,7 +7,7 @@ MAKE_VERSION:=3.81
 MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE:=$(BR2_GNU_MIRROR)/make
 
-MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
                GLOBINC='-I$(@D)/glob' \

diff --git a/package/midori/Config.in b/package/midori/Config.in
index 49867e42779d1a4c19a1e3fb82dbbab3d00e270e..41f451588d214d58a9f222cf8049c33e81390e78 100644 (file)
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_MIDORI
        select BR2_PACKAGE_WEBKIT
        select BR2_PACKAGE_LIBSEXY
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        depends on BR2_PACKAGE_LIBGTK2
        depends on BR2_INSTALL_LIBSTDCPP # webkit

diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 87559bb05f8ce67cdec1389c554f6704c83f936a..33f94cf5d3ed6700ffc3ba5d26f2246329aefeb7 100644 (file)
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -14,7 +14,7 @@ MIDORI_DEPENDENCIES = \
        libgtk2 \
        libsexy \
        webkit \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
        $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 ifneq ($(BR2_PACKAGE_XORG7),y)

diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index 6e6d64c66ed1080c4d428766f6748c4bcb691505..6c767bb6b99e6e53602e46d18d552e8a664974a0 100644 (file)
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_PULSEAUDIO
        select BR2_PACKAGE_JSON_C
        select BR2_PACKAGE_LIBSNDFILE
        select BR2_PACKAGE_SPEEX
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
+       select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        help
          PulseAudio is a sound system for POSIX OSes, meaning that it
          is a proxy for your sound applications. It allows you to do

diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk
index 13d87709e635e778b67f3036fcd96a9a5a464953..6f7d7d2e377a3bd04b9725ecb7b198853078d1e0 100644 (file)
--- a/package/multimedia/pulseaudio/pulseaudio.mk
+++ b/package/multimedia/pulseaudio/pulseaudio.mk
@@ -16,7 +16,7 @@ PULSEAUDIO_CONF_OPT = \
 
 PULSEAUDIO_DEPENDENCIES = \
        host-pkg-config libtool json-c libsndfile speex host-intltool \
-       $(if $(BR2_PACKAGE_LIBINTL),libintl) \
+       $(if $(BR2_PACKAGE_GETTEXT),gettext) \
        $(if $(BR2_PACKAGE_LIBATOMIC_OPS),libatomic_ops) \
        $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
        $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \

diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index eb30e11aaa536e278f3ea5e6a036a7612f6f753b..f58cc13beab51d93feb6d87be69082ba0e6d450e 100644 (file)
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -10,8 +10,8 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-NDISC6_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+NDISC6_DEPENDENCIES += gettext
 NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
 endif
 

diff --git a/package/pango/Config.in b/package/pango/Config.in
index 923c3d4ac2c59bae8423af9d717106c14a380d5e..60e9931a4345adc364d29617c8e9f54e96fe11b0 100644 (file)
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_PANGO
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Pango is a library for laying out and rendering of text, with an
          emphasis on internationalization. Pango can be used anywhere that

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index efb722dc934dfd8aebeaad25636755de561bb4ec..86ab474abab10af778a923501474328905d489dc 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -41,7 +41,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 
 PANGO_CONF_OPT = --enable-explicit-deps=no --disable-debug
 
-PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-pkg-config libglib2 cairo
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \

diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in
index a13820426cf91cd5b1a548ba82124b2f78a9eb5a..cc8420b7bb6ba7ee10bc2f5865f42c9dc27f5c99 100644 (file)
--- a/package/psmisc/Config.in
+++ b/package/psmisc/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_PSMISC
        bool "psmisc"
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Helpful /proc related utilities such as pstree, fuser, and killall
 

diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 3132b708ac803b32a488d1bf1eb2b886e70f4f60..5d2333fd2893bb582aa2d73aa0e933345905de0d 100644 (file)
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -8,7 +8,7 @@ PSMISC_VERSION = 22.16
 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
 PSMISC_LICENSE = GPLv2
 PSMISC_LICENSE_FILES = COPYING
-PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 ifneq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
 # Don't force -fstack-protector

diff --git a/package/quota/Config.in b/package/quota/Config.in
index 6c2beff04c021e635e4833bbce99643459a7f559..3ad0b8cee36761621d1f00751fe98a65087b855d 100644 (file)
--- a/package/quota/Config.in
+++ b/package/quota/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_QUOTA
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_MOUNT
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Implementation of the disk quota system.
 

diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index 7602e930534c2a0ccbb5a909092166256f72f599..abe3675207939d170c6448e49aa5b1db8f5e577e 100644 (file)
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -11,7 +11,7 @@ QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(Q
 QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-QUOTA_DEPENDENCIES = gettext libintl
+QUOTA_DEPENDENCIES = gettext
 QUOTA_MAKE_OPT += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
 endif
 

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 73d552fa0a65d6aa1f7e8ac56ae3458b307d3893..37188ba82e8d42687f7f634e9adb561f8d9372b0 100644 (file)
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_SSHFS
        select BR2_PACKAGE_LIBFUSE
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_OPENSSH
        depends on BR2_LARGEFILE

diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 67b9c7f53fe2879894c11b1fa64000f36ff27ff7..e72db0aad9febfa51323e39c6bd011aa3f5591aa 100644 (file)
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -9,7 +9,7 @@ SSHFS_SITE = http://downloads.sourceforge.net/project/fuse/sshfs-fuse/$(SSHFS_VE
 SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = \
        libglib2 libfuse openssh \
-       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
+       $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
        $(if $(BR2_ENABLE_LOCALE),,libiconv)
 
 $(eval $(autotools-package))

diff --git a/package/sysstat/Config.in b/package/sysstat/Config.in
index 6e62ff158414e732c3a73e5c0c37db6237cd55c7..ceba5030b467b8207075fb6233f4e5d8c894753f 100644 (file)
--- a/package/sysstat/Config.in
+++ b/package/sysstat/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_SYSSTAT
        bool "sysstat"
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        # Uses fork()
        depends on BR2_USE_MMU
        help

diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index 9d91a423fd2aae591c09f68fe36eb946646df7ec..83609a02e5f0d0001c2a5318cf0bbebd13f28bf6 100644 (file)
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -14,7 +14,7 @@ SYSSTAT_CONF_OPT += --disable-documentation
 endif
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-SYSSTAT_DEPENDENCIES += gettext libintl
+SYSSTAT_DEPENDENCIES += gettext
 SYSSTAT_MAKE_OPT += CFLAGS+=-lintl
 endif
 

diff --git a/package/ushare/Config.in b/package/ushare/Config.in
index acf025fa5bf2a5e462da4bc8f6497bf7c7da654d..f7b2124de753a390e5b2138c572014b94ca757dd 100644 (file)
--- a/package/ushare/Config.in
+++ b/package/ushare/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_USHARE
        depends on BR2_LARGEFILE
        select BR2_PACKAGE_LIBUPNP
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          uShare is a UPnP (TM) A/V & DLNA Media Server.
          It implements the server component that provides UPnP media devices

diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 2d8bca57ceda2a9fd4fdd193f42a1220c0e80ff7..78cbcdaac157d072d466c08daeee9f1d60b1d4c1 100644 (file)
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -10,7 +10,7 @@ USHARE_SITE = http://ushare.geexbox.org/releases
 USHARE_DEPENDENCIES = host-pkg-config libupnp
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-USHARE_DEPENDENCIES += gettext libintl
+USHARE_DEPENDENCIES += gettext
 USHARE_LDFLAGS += -lintl
 endif
 

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index ddc9c1254e4bb07aae61a6a3cd4b908832238a9c..71a6c533a46449057e807b156653f61941b516e4 100644 (file)
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -29,8 +29,8 @@ else
 UTIL_LINUX_CONF_OPT += --without-ncurses
 endif
 
-ifeq ($(BR2_PACKAGE_LIBINTL),y)
-UTIL_LINUX_DEPENDENCIES += libintl
+ifeq ($(BR2_PACKAGE_GETTEXT),y)
+UTIL_LINUX_DEPENDENCIES += gettext
 UTIL_LINUX_MAKE_OPT += LIBS=-lintl
 endif
 

diff --git a/package/vala/Config.in b/package/vala/Config.in
index 89b445933280f4b6e8c298675e369566af0a161c..e0d665c89215fe3cae03391ab6686637dc6936f6 100644 (file)
--- a/package/vala/Config.in
+++ b/package/vala/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_VALA
        depends on BR2_USE_WCHAR # glib2
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-       select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        help
          Compiler for the GObject type system.

diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 73ac8ee2ab9b0f8cda0696062681e56e1f6d626b..e4b8b54da55fa3a02aad81c3ce86a8eb122a5ed1 100644 (file)
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -11,7 +11,7 @@ VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
 
 VALA_DEPENDENCIES = host-flex libglib2 \
-               $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
+               $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 # If we want the documentation, then xsltproc is needed. If we don't
 # want the documentation, force Vala to not use the host xsltproc even