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

gettext: remove libintl handling 



Now, the gettext package always:

 * install everything to the staging directory
 * install the libraries to the target directory

Note that this commit removes BR2_PACKAGE_LIBINTL without updating the
packages, it is done in a separate commit to ease the review process.

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: keep BR2_PACKAGE_LIBINTL as blind option]
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 cd54bec3

package/gettext/Config.in

+6 −8
Original line number Diff line number Diff line
@@ -7,17 +7,15 @@ config BR2_PACKAGE_GETTEXT 
	  framework to help other GNU packages produce multi-lingual

	  messages.



	  Only the gettext libraries will be installed in the

	  target. The full gettext suite, including tools, will be

	  installed in the staging directory.



	  http://www.gnu.org/software/gettext/



comment "gettext requires a toolchain with WCHAR support"

	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR



config BR2_PACKAGE_LIBINTL

	bool "libintl"

	depends on BR2_NEEDS_GETTEXT

	depends on BR2_USE_WCHAR

	help

	  Selecting this package installs all of gettext in the staging

	  directory and the shared library for it's use in the target.



	  http://www.gnu.org/software/gettext/
 
	bool

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

package/gettext/gettext.mk

+1 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY): $(GETTEXT_DIR)/$(GETTEXT_BINARY) 
gettext-legal-info:

	@$(call legal-warning-pkg,gettext,legal-info not yet implemented)



gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)

gettext: host-pkg-config $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)



gettext-unpacked: $(GETTEXT_DIR)/.unpacked
@@ -139,16 +139,11 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY) 
		libgettext*.so*.la libintl*.so*.la)

	touch -c $@



libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_LIBINTL),y)

TARGETS+=libintl

endif

ifeq ($(BR2_PACKAGE_GETTEXT),y)

TARGETS+=gettext

endif