From 088ee8cfa40c2092393980530a4fceac782bd0c8 Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Thu, 5 Jun 2014 01:04:11 +0200 Subject: [PATCH] xbmc: fix missing libraries from rpi-userland When rpi-userland libraries are built as shared-objects, not all needed libraries are passed in the LD_FLAGS, leading to failure at linkage. To avoid this issue, set the LIBS variable content in accordance with the INCLUDES variable value. The commit 5e3b1f31b3f82e3b163567f10d7131c9d649a2cf currently works around this issue by forcing rpi-userland to be statically linked, whereas it is actually a LIBS flags problem in xbmc package. A follow-up patch fixes rpi-userland package. Reported-by: Maxime Hadjinlian Signed-off-by: Samuel Martin Cc: Maxime Hadjinlian Cc: "Yann E. MORIN" Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Tested-by: "Maxime Hadjinlian" Signed-off-by: Thomas Petazzoni --- package/xbmc/xbmc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk index ca605a4c80..1d458d4e78 100644 --- a/package/xbmc/xbmc.mk +++ b/package/xbmc/xbmc.mk @@ -65,7 +65,8 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) XBMC_DEPENDENCIES += rpi-userland XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" + -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \ + LIBS="-lvcos -lvchostif" endif ifeq ($(BR2_PACKAGE_DBUS),y) -- 2.30.2