From: Ulf Samuelsson <ulf.samuelsson@atmel.com>
Date: Mon, 16 Jul 2007 10:00:29 +0000 (-0000)
Subject: Temporarily allow static libgettext library option to ensure build can complete for ARM
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5dce7d3005e1fe6c95cf67f096bf05e39651d226;p=buildroot.git

Temporarily allow static libgettext library option to ensure build can complete for ARM
---

diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index 3c056d6470..7e92a9622c 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -8,6 +8,19 @@ config BR2_PACKAGE_GETTEXT
 
 	  http://www.gnu.org/software/gettext/
 
+config BR2_PACKAGE_GETTEXT_STATIC
+	bool "Use libgettext.a instead of libgettext.so.*"
+	default y
+	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"
 	default n
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 63bb2248b8..f6c9719418 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -11,6 +11,12 @@ GETTEXT_CAT:=$(ZCAT)
 GETTEXT_BINARY:=gettext-runtime/src/gettext
 GETTEXT_TARGET_BINARY:=usr/bin/gettext
 
+ifeq ($(strip $(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):
 	 $(WGET) -P $(DL_DIR) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
 
@@ -91,6 +97,7 @@ $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--disable-libasprintf \
+		--enable-shared \
 		$(IGNORE_EXTERNAL_GETTEXT) \
 		$(OPENMP) \
 	);
@@ -144,7 +151,12 @@ $(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
 	rm -f $(TARGET_DIR)/usr/lib/libgettext*.so*.la $(TARGET_DIR)/usr/lib/libintl*.so*.la
 	touch -c $@
 
-libintl: $(TARGET_DIR)/usr/lib/libintl.so
+$(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)
 
 #############################################################
 #