summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Krause <joerg.krause@embedded.rocks>2017-01-10 23:39:25 +0100
committerPeter Korsgaard <peter@korsgaard.com>2017-01-11 12:28:28 +0100
commit43b49a091e886fb1f2d411187d2929d8d17ce3a4 (patch)
tree7d3eb188db8fdb1cee1a60f8ac580559265ff3cb
parent5b1ebb102935123c61bf1e2eedf3f2cd89f535d1 (diff)
downloadbuildroot-43b49a091e886fb1f2d411187d2929d8d17ce3a4.tar.gz
buildroot-43b49a091e886fb1f2d411187d2929d8d17ce3a4.zip
package/mpd: fix static linking with tremor
Although tremor (the library is named vorbisidec) provides a pkg-config file, mpd does not use it to find tremor. Since version 0.20 does throw an error instead of a warning, that's why the issue was left unnoticed by the autobuilders. Help mpd to find tremor by providing the path to the library and passing LIBS through the environment. We use the host pkg-config tool to get the correct values from the vorbisidec.pc file. Fixes: http://autobuild.buildroot.net/results/6b9/6b97403e70caa12c32494b1c82ce61d3e4e456f6/ Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/mpd/mpd.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 10e6b90dda..bee68436de 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -222,7 +222,10 @@ endif
ifeq ($(BR2_PACKAGE_MPD_TREMOR),y)
MPD_DEPENDENCIES += tremor
-MPD_CONF_OPTS += --with-tremor
+# Help mpd to find tremor in static linking scenarios
+MPD_CONF_ENV += \
+ TREMOR_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs vorbisidec`"
+MPD_CONF_OPTS += --with-tremor=$(STAGING_DIR)/usr
endif
ifeq ($(BR2_PACKAGE_MPD_TWOLAME),y)
OpenPOWER on IntegriCloud