From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 10 Aug 2014 15:12:08 +0000 (+0200)
Subject: package/fbv: Fix static linking against libpng
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a3ff0ad550ba1bfd88e66ac8209446577e889849;p=buildroot.git

package/fbv: Fix static linking against libpng

Fixes
http://autobuild.buildroot.net/results/9ca/9cacec257f979745a7d4a43224b243ee4e16f9ac/
http://autobuild.buildroot.net/results/996/996e42396546555e9fcf0c7135aac610ccca4eee/
http://autobuild.buildroot.net/results/c91/c918046900045c34c73e16578026cce3e6bcccf8/

[Peter: adjust description, pass --static to pkg-config, only use for static linking]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 6f41d9ff80..cc1dc7be88 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -15,6 +15,12 @@ FBV_DEPENDENCIES = # empty
 FBV_CONFIGURE_OPTS = # empty
 ifeq ($(BR2_PACKAGE_FBV_PNG),y)
 FBV_DEPENDENCIES += libpng
+
+# libpng in turn depends on other libraries
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+FBV_CONFIGURE_OPTS += "--libs=$(shell $(PKGg_CONFIG_HOST_BINARY) --libs libpng --static)"
+endif
+
 else
 FBV_CONFIGURE_OPTS += --without-libpng
 endif