Patchwork gettext: fix static build failure

login
register
mail settings
Submitter Gustavo Zacarias
Date Jan. 19, 2013, 12:06 p.m.
Message ID <1358597185-7602-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/213834/
State Accepted
Commit ad0279f0ee51e97bf7dbb70fdd6f14f789f344a8
Headers show

Comments

Gustavo Zacarias - Jan. 19, 2013, 12:06 p.m.
When static libraries are preferred we don't build dynamic libraries so
it fails on the install phase. So don't try to do it for those cases.
Fixes:
http://autobuild.buildroot.net/results/651537ae1909b039e0cfc5c104ee87f93a9e5792/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/gettext/gettext.mk | 3 +++
 1 file changed, 3 insertions(+)
Peter Korsgaard - Jan. 20, 2013, 8:55 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> When static libraries are preferred we don't build dynamic libraries so
 Gustavo> it fails on the install phase. So don't try to do it for those cases.
 Gustavo> Fixes:
 Gustavo> http://autobuild.buildroot.net/results/651537ae1909b039e0cfc5c104ee87f93a9e5792/

Committed, thanks.

We arguably should install the .a file to the target then, but as
target-gcc is going away ..
Gustavo Zacarias - Jan. 20, 2013, 12:28 p.m.
On 01/20/2013 05:55 AM, Peter Korsgaard wrote:

> Committed, thanks.
> 
> We arguably should install the .a file to the target then, but as
> target-gcc is going away ..

Yes, completely on purpose.
There are probably other packages that don't do it either, so there's
not much point in looking around and fixing it for an option that's
going away.
Regards.

Patch

diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 953077d..204af10 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -35,9 +35,12 @@  endif
 # When the gettext tools are not enabled in the configuration, we only
 # install libintl to the target.
 ifeq ($(BR2_PACKAGE_GETTEXT_TOOLS),)
+# When static libs are preferred the .so files aren't created
+ifeq ($(BR2_PREFER_STATIC_LIB),)
 define GETTEXT_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
 endef
+endif
 # Ditch the tools since they're off and pull other dependencies
 define GETTEXT_DISABLE_TOOLS
 	$(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in