gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make all package using gettext rely on BR2_NEEDS_GETTEXT 

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-05-14 09:44:03 +02:00
parent 54d64798e1
commit 542fbe8520
24 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/avahi/Config.in
View File

@ -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.

2
package/avahi/avahi.mk
View File

@ -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

4
package/gmpc/Config.in
View File

@ -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

3
package/gmpc/gmpc.mk
View File

@ -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

4
package/grep/Config.in
View File

@ -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.

2
package/grep/grep.mk
View File

@ -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))

4
package/hal/Config.in
View File

@ -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

2
package/hal/hal.mk
View File

@ -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

4
package/libglib2/Config.in
View File

@ -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.

2
package/libglib2/libglib2.mk
View File

@ -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

2
package/libidn/libidn.mk
View File

@ -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))

2
package/libsoup/libsoup.mk
View File

@ -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))

4
package/make/Config.in
View File

@ -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.

2
package/make/make.mk
View File

@ -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

2
package/multimedia/libmpd/Config.in
View File

@ -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.

2
package/pango/pango.mk
View File

@ -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

2
package/php/Config.ext
View File

@ -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

2
package/php/php.mk
View File

@ -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)

4
package/psmisc/Config.in
View File

@ -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

8
package/psmisc/psmisc.mk
View File

@ -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))

4
package/sshfs/Config.in
View File

@ -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

2
package/sshfs/sshfs.mk
View File

@ -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))

4
package/util-linux/Config.in
View File

@ -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.

4
package/util-linux/util-linux.mk
View File

@ -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