summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-05-31 21:40:07 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-05-31 21:42:07 +0200
commit62d925ee68fd3aa3fece9af11f19cf61fb6b5140 (patch)
treec4c4454e38122b98d24bd08a713f2bddd7a81e34
parent3afbc4f378bf9ba9a5ccc774df6128343e6d4a70 (diff)
downloadbuildroot-62d925ee68fd3aa3fece9af11f19cf61fb6b5140.tar.gz
buildroot-62d925ee68fd3aa3fece9af11f19cf61fb6b5140.zip
upmpdcli: fix static linking issue
Fixes: http://autobuild.buildroot.net/results/7ed/7ed85071bc06b4806e90b278a0736ea70c01b456/ Upmpdcli forgets to take the dependencies of libupnpp into consideration, breaking static linking, so help it. Libupnpp unfortunately doesn't provide a .pc file, so manually handle its dependencies here. The build system doesn't expand LIBS from the configure step, so manually pass it to make. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/upmpdcli/upmpdcli.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk
index 0be4d912ae..a5c6370fd5 100644
--- a/package/upmpdcli/upmpdcli.mk
+++ b/package/upmpdcli/upmpdcli.mk
@@ -10,6 +10,18 @@ UPMPDCLI_LICENSE = GPLv2+
UPMPDCLI_LICENSE_FILES = COPYING
UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp
+ifeq ($(BR2_STATIC_LIBS),y)
+# Upmpdcli forgets to take the dependencies of libupnpp into
+# consideration, breaking static linking, so help it.
+# Libupnpp unfortunately doesn't provide a .pc file, so manually
+# handle the dependencies here.
+# The build system doesn't expand LIBS from the configure step, so
+# manually pass it to make.
+UPMPDCLI_DEPENDENCIES += host-pkgconf
+UPMPDCLI_MAKE_OPTS = \
+ LIBS='$(shell $(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp)'
+endif
+
# Upmpdcli only runs if user upmpdcli exists
define UPMPDCLI_USERS
upmpdcli -1 upmpdcli -1 * - - - Upmpdcli MPD UPnP Renderer Front-End
OpenPOWER on IntegriCloud