diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2016-09-15 08:40:00 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-17 13:35:31 +0200 |
| commit | 56d878a92727ee8883975e1fead4e4d2206ff62f (patch) | |
| tree | 473048e696f951cb8d4818669e832cedf1980961 /package/upmpdcli/upmpdcli.mk | |
| parent | af4d2b27d61d2ef232da3371772d1b2f99d3d40d (diff) | |
| download | buildroot-56d878a92727ee8883975e1fead4e4d2206ff62f.tar.gz buildroot-56d878a92727ee8883975e1fead4e4d2206ff62f.zip | |
package/upmpdcli: add patch to use pkg-config for libupnpp
Building upmpdcli aborts because of an unsafe header inclusion of
`/usr/include/libupnpp`. Using `{prefix}` to get the header path is
wrong for cross-compilation.
Instead of hard-coding the flags for libupnpp use pkg-config to get the
correct ones.
Note that this patch adds the host-pkgconfig dependency unconditionally and
removes the necessity to pass the libupnpp manually to LIBS for a static
build.
Upstream-status: https://github.com/medoc92/upmpdcli/pull/49
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/upmpdcli/upmpdcli.mk')
| -rw-r--r-- | package/upmpdcli/upmpdcli.mk | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk index b70f413026..3beda1bd00 100644 --- a/package/upmpdcli/upmpdcli.mk +++ b/package/upmpdcli/upmpdcli.mk @@ -8,23 +8,12 @@ UPMPDCLI_VERSION = 1.2.2 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads UPMPDCLI_LICENSE = GPLv2+ UPMPDCLI_LICENSE_FILES = COPYING -UPMPDCLI_DEPENDENCIES = libmpdclient libupnpp libmicrohttpd jsoncpp -# touching configure.ac in +UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp +# touching configure.ac and Makefile.am in # 0001-fix-jsoncpp-detection.patch +# 0002-use-pkg-config-for-libupnpp.patch UPMPDCLI_AUTORECONF = YES -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="`$(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 |
