From bbcbed1829057121f9f9459f62f913626206e823 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Sep 2012 12:57:49 +0000 Subject: [PATCH] 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 Tested-by: "Yann E. MORIN" [yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL] Signed-off-by: "Yann E. MORIN" Tested-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Arnout Vandecappelle (Essensium/Mind) CC: Samuel Martin Signed-off-by: Peter Korsgaard --- package/avahi/Config.in | 1 - package/avahi/avahi.mk | 6 +++--- package/axel/Config.in | 1 - package/axel/axel.mk | 2 +- package/binutils/Config.in | 1 - package/binutils/binutils.mk | 2 +- package/diffutils/diffutils.mk | 3 +-- package/dnsmasq/Config.in | 1 - package/dnsmasq/dnsmasq.mk | 2 +- package/flex/flex.mk | 3 +-- package/gdk-pixbuf/Config.in | 1 - package/gdk-pixbuf/gdk-pixbuf.mk | 2 +- package/gettext/Config.in | 4 ---- package/glib-networking/Config.in | 1 - package/glib-networking/glib-networking.mk | 2 +- package/gmpc/Config.in | 1 - package/gmpc/gmpc.mk | 2 +- package/grep/Config.in | 1 - package/grep/grep.mk | 2 +- package/kbd/Config.in | 1 - package/kbd/kbd.mk | 2 +- package/libglib2/Config.in | 1 - package/libglib2/libglib2.mk | 2 +- package/libsoup/Config.in | 1 - package/libsoup/libsoup.mk | 2 +- package/linux-pam/Config.in | 1 - package/linux-pam/linux-pam.mk | 4 ++-- package/lshw/lshw.mk | 2 +- package/make/Config.in | 1 - package/make/make.mk | 2 +- package/midori/Config.in | 1 - package/midori/midori.mk | 2 +- package/multimedia/pulseaudio/Config.in | 2 +- package/multimedia/pulseaudio/pulseaudio.mk | 2 +- package/ndisc6/ndisc6.mk | 4 ++-- package/pango/Config.in | 1 - package/pango/pango.mk | 2 +- package/psmisc/Config.in | 1 - package/psmisc/psmisc.mk | 2 +- package/quota/Config.in | 1 - package/quota/quota.mk | 2 +- package/sshfs/Config.in | 1 - package/sshfs/sshfs.mk | 2 +- package/sysstat/Config.in | 1 - package/sysstat/sysstat.mk | 2 +- package/ushare/Config.in | 1 - package/ushare/ushare.mk | 2 +- package/util-linux/util-linux.mk | 4 ++-- package/vala/Config.in | 1 - package/vala/vala.mk | 2 +- 50 files changed, 33 insertions(+), 60 deletions(-) diff --git a/package/avahi/Config.in b/package/avahi/Config.in index eb3ccb67b0..8ba33d5e70 100644 --- 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 a26481d4eb..03dc36859f 100644 --- 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 98f4941096..d8232725c2 100644 --- 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 893caf1248..0ed8ad2e1c 100644 --- 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 e068b20d40..64803706e3 100644 --- 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 a91879a701..d41cac4e9c 100644 --- 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 d6029a4e60..168d040248 100644 --- 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 e67aa46170..b76ddb2cc3 100644 --- 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 1f714bf577..e92a554ace 100644 --- 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 16f6801769..2599cdc75f 100644 --- 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 28a0f12c1a..33b5f7c862 100644 --- 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 0d9e20600a..92a34bfcf2 100644 --- 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 04f7de673c..de19410003 100644 --- 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 16f0d4a22f..dab35eaba2 100644 --- 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 385ad47fc7..823ba39486 100644 --- 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 f86945c9e8..9b38d1a4f0 100644 --- 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 51d0cd9536..a136cf4fe1 100644 --- 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 1b39922fca..5906e698af 100644 --- 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 a02fe2c92b..2636c83b78 100644 --- 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 a23b70a81f..44c3163388 100644 --- 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 a52ad5ac7f..325978e6cc 100644 --- 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 d1d7231b00..5282885b8b 100644 --- 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 2b2bd32f5f..030cecbc23 100644 --- 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 f40625d487..57b425f283 100644 --- 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 fe1a41c6ec..30655ba303 100644 --- 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 722b87576d..7cfd8147a5 100644 --- 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 48cb073943..1a2e7f6bf7 100644 --- 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 a53c1073ee..68daa0d5f3 100644 --- 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 364bb1e18a..ea2ae1b58b 100644 --- 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 a0981c7181..02b2741fd8 100644 --- 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 49867e4277..41f451588d 100644 --- 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 87559bb05f..33f94cf5d3 100644 --- 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 6e6d64c66e..6c767bb6b9 100644 --- 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 13d87709e6..6f7d7d2e37 100644 --- 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 eb30e11aaa..f58cc13bea 100644 --- 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 923c3d4ac2..60e9931a43 100644 --- 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 efb722dc93..86ab474aba 100644 --- 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 a13820426c..cc8420b7bb 100644 --- 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 3132b708ac..5d2333fd28 100644 --- 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 6c2beff04c..3ad0b8cee3 100644 --- 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 7602e93053..abe3675207 100644 --- 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 73d552fa0a..37188ba82e 100644 --- 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 67b9c7f53f..e72db0aad9 100644 --- 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 6e62ff1584..ceba5030b4 100644 --- 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 9d91a423fd..83609a02e5 100644 --- 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 acf025fa5b..f7b2124de7 100644 --- 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 2d8bca57ce..78cbcdaac1 100644 --- 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 ddc9c1254e..71a6c533a4 100644 --- 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 89b4459332..e0d665c892 100644 --- 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 73ac8ee2ab..e4b8b54da5 100644 --- 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 -- 2.30.2