Commit bbcbed18 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998@free.fr: remove BR2_PACKAGE_LIBINTL]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
CC: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 9a073460

package/avahi/Config.in

+0 −1
Original line number Diff line number Diff line 
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.

package/avahi/avahi.mk

+3 −3
Original line number Diff line number Diff line
@@ -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

package/axel/Config.in

+0 −1
Original line number Diff line number Diff line 
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.

package/axel/axel.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

package/binutils/Config.in

+0 −1
Original line number Diff line number Diff line 
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