From 300cd640ecc6aa54c43ffeb1fc6aa4750c70885b Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 16 Sep 2012 12:57:46 +0000 Subject: [PATCH] gettext: remove option to build statically Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" Acked-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/gettext/Config.in | 12 ------------ package/gettext/gettext.mk | 9 --------- 2 files changed, 21 deletions(-) diff --git a/package/gettext/Config.in b/package/gettext/Config.in index fabfe1ef71..0ee4065c4d 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 97780073fc..20bd672737 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) ############################################################# -- 2.30.2