diff mbox

[01/12] gettext: remove option to build statically

Message ID 1346600635-30946-2-git-send-email-yann.morin.1998@free.fr
State Superseded
Headers show

Commit Message

Yann E. MORIN Sept. 2, 2012, 3:43 p.m. UTC
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/gettext/Config.in  |   12 ------------
 package/gettext/gettext.mk |    9 ---------
 2 files changed, 0 insertions(+), 21 deletions(-)

Comments

Arnout Vandecappelle Sept. 3, 2012, 9:01 a.m. UTC | #1
On 09/02/12 17:43, Yann E. MORIN wrote:
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> Reviewed-by: "Yann E. MORIN"<yann.morin.1998@free.fr>

  In the last BR developer meeting, we agreed not to use the Reviewed-by: tag,
but only the Acked-by: tag.  It should be used when you've reviewed the
patch and you would commit it if you had commit access.


  Another thing: it was actually Samuel Martin who initiated this patch
series.  However, the original patches were rewritten so completely by
Thomas and Maxime that it doesn't make sense to keep his Signed-off-by.
To be able to keep some of the credit, I propose to add a Cc: tag in
such a situation.


  Finally, for the whole series except 10/12 and 12/12:
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(build-test with a minimal x86 config)

  And:
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


  I'm pretty much in favour of committing patches 1 to 9 now.  The first
six have had plenty of time for review, 7 and 8 are fairly obvious
bugfixes, and 9 is a mechanical rename.

  Regards,
  Arnout
Yann E. MORIN Sept. 3, 2012, 9:21 a.m. UTC | #2
Arnout, Thomas, All,

On Monday 03 September 2012 11:01:46 Arnout Vandecappelle wrote:
> On 09/02/12 17:43, Yann E. MORIN wrote:
> > Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> > Reviewed-by: "Yann E. MORIN"<yann.morin.1998@free.fr>
> 
>   In the last BR developer meeting, we agreed not to use the Reviewed-by: tag,
> but only the Acked-by: tag.  It should be used when you've reviewed the
> patch and you would commit it if you had commit access.

OK. So, to whoever commits these patches, you can change my
Reviewed-by into an Acked-by

> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Thank you!

Regards,
Yann E. MORIN.
Yann E. MORIN Sept. 3, 2012, 6:02 p.m. UTC | #3
Arnout, All,

On Monday 03 September 2012 11:01:46 Arnout Vandecappelle wrote:
>   I'm pretty much in favour of committing patches 1 to 9 now.  The first
> six have had plenty of time for review, 7 and 8 are fairly obvious
> bugfixes, and 9 is a mechanical rename.

I'd suggest we wait yet a little tiny bit until later tonight (+0200),
I will re-submit the whole series with your comments (and ack/tst).

Regards,
Yann E. MORIN.
diff mbox

Patch

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)
 
 #############################################################