aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-11-03 14:19:12 -0700
committerAndreas Oberritter <obi@opendreambox.org>2017-06-26 22:59:19 +0200
commit02bc83b038784dfcfb7b9cb193224f41a0e7dd2a (patch)
treea1c9597ffd52ca59cdc34af94175185899962817
parent3d2beea872324cbad66f23a66f05663f7eab7ede (diff)
downloadmeta-openembedded-contrib-02bc83b038784dfcfb7b9cb193224f41a0e7dd2a.tar.gz
meta-openembedded-contrib-02bc83b038784dfcfb7b9cb193224f41a0e7dd2a.tar.bz2
meta-openembedded-contrib-02bc83b038784dfcfb7b9cb193224f41a0e7dd2a.zip
kodi: Fix build with pic on x86_64
Upgrade 17.x to latest on master Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 99fce36cad8510911b8d72d27f03c381c9966c6b) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch30
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb3
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch
new file mode 100644
index 0000000000..f513334bfc
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch
@@ -0,0 +1,30 @@
+From 603e8925a8b1609d483d866346a35fefbc66cfca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 3 Nov 2016 13:10:00 -0700
+Subject: [PATCH 5/5] Always compile libcpluff as PIC
+
+Fixes errors e.g.
+
+ld: lib/cpluff/libcpluff/.libs/libcpluff.a(pcontrol.o): relocation R_X86_64_PC32 against symbol `cp_stop_plugins' can not be used when making a shared object; recompile with -fPIC
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b210b73..52d5f11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2385,7 +2385,7 @@ XB_CONFIG_MODULE([lib/cpluff], [
+ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
+ --host=$host_alias \
+ --build=$build_alias \
+- --target=$target_alias CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS" LIBS=""
++ --target=$target_alias --with-pic=yes CFLAGS="$CFLAGS" CC="$CC" CXX="$CXX" LDFLAGS="$LDFLAGS" LIBS=""
+ #LDFLAGS="$LDFLAGS -Wl,-read_only_relocs,suppress"
+ ], [0])
+
+--
+2.10.2
+
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
index c9de5920d2..ba14d6433a 100644
--- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
@@ -63,13 +63,14 @@ DEPENDS = " \
PROVIDES = "xbmc"
-SRCREV = "32c7788e7cce711be5b7f3893c82dddd79658268"
+SRCREV = "7f6abd1dd6d1aefcb4303083f34aaa90a8df9fce"
PV = "17.0+gitr${SRCPV}"
SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \
file://0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \
file://0002-handle-SIGTERM.patch \
file://0003-add-support-to-read-frequency-output-if-using-intel-.patch \
file://0004-Disable-DVD-support.patch \
+ file://0005-Always-compile-libcpluff-as-PIC.patch \
"
inherit autotools-brokensep gettext pythonnative