summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-09-16 12:57:46 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-09-20 19:26:42 (GMT)
commit300cd640ecc6aa54c43ffeb1fc6aa4750c70885b (patch)
tree3a4045d7e37a60bd68cf8aea8e6587055b7b2251
parent9f996396d5ec8e6de6882695de970f24cfcfe59d (diff)
downloadbuildroot-300cd640ecc6aa54c43ffeb1fc6aa4750c70885b.tar.gz
buildroot-300cd640ecc6aa54c43ffeb1fc6aa4750c70885b.tar.bz2
gettext: remove option to build statically
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Acked-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>
-rw-r--r--package/gettext/Config.in12
-rw-r--r--package/gettext/gettext.mk9
2 files changed, 0 insertions, 21 deletions
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index fabfe1e..0ee4065 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -12,18 +12,6 @@ config BR2_PACKAGE_GETTEXT
comment "gettext requires a toolchain with WCHAR support"
depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
-config BR2_PACKAGE_GETTEXT_STATIC
- bool "Use libgettext.a instead of libgettext.so.*"
- depends on BR2_PACKAGE_GETTEXT
- depends on BR2_arm
- help
- The GNU `gettext' utilities are a set of tools that provide a
- framework to help other GNU packages produce multi-lingual
- messages.
-
- http://www.gnu.org/software/gettext/
-
-
config BR2_PACKAGE_LIBINTL
bool "libintl"
depends on BR2_NEEDS_GETTEXT
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 9778007..20bd672 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -11,11 +11,7 @@ GETTEXT_CAT:=$(ZCAT)
GETTEXT_BINARY:=gettext-runtime/src/gettext
GETTEXT_TARGET_BINARY:=usr/bin/gettext
-ifeq ($(BR2_PACKAGE_GETTEXT_STATIC),y)
-LIBINTL_TARGET_BINARY:=usr/lib/libintl.a
-else
LIBINTL_TARGET_BINARY:=usr/lib/libintl.so
-endif
$(DL_DIR)/$(GETTEXT_SOURCE):
$(call DOWNLOAD,$(GETTEXT_SITE)/$(GETTEXT_SOURCE))
@@ -147,11 +143,6 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
libgettext*.so*.la libintl*.so*.la)
touch -c $@
-$(TARGET_DIR)/usr/lib/libintl.a: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
- cp -dpf $(STAGING_DIR)/usr/lib/libgettext*.a $(TARGET_DIR)/usr/lib/
- cp -dpf $(STAGING_DIR)/usr/lib/libintl*.a $(TARGET_DIR)/usr/lib/
- touch -c $@
-
libintl: $(TARGET_DIR)/$(LIBINTL_TARGET_BINARY)
#############################################################