summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-04-16 15:00:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commitf03dccc7ecc053ea714dac8078b578b6f1a4e0dd (patch)
treeffdf97bc5f2e04e6e2d0724b49f2117e6995d263
parent2c9c4a406a0fbb41b30a538806d2b48ce7b9d435 (diff)
downloadpoky-f03dccc7ecc053ea714dac8078b578b6f1a4e0dd.tar.gz
python 2.7: fix multilib patch to accept multiarch style paths
Using 'basename' to strip the prefix fails when using multiarch style paths. (From OE-Core rev: c61c416a6504f7e8885df3c94c839d1031920a1c) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python.inc6
-rw-r--r--meta/recipes-devtools/python/python/multilib.patch2
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 979b601bf1..84bcb6aa8a 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -33,6 +33,12 @@ EXTRA_OECONF = "\
33 ${PYTHONLSBOPTS} \ 33 ${PYTHONLSBOPTS} \
34" 34"
35 35
36do_configure_prepend() {
37 libdirleaf="$(echo ${libdir} | sed -e 's:${prefix}/::')"
38 sed -i -e "s:SEDMELIBLEAF:${libdirleaf}:g" \
39 ${S}/configure.ac
40}
41
36do_install_append () { 42do_install_append () {
37 sed -i -e 's:${HOSTTOOLS_DIR}/install:install:g' \ 43 sed -i -e 's:${HOSTTOOLS_DIR}/install:install:g' \
38 -e 's:${HOSTTOOLS_DIR}/mkdir:mkdir:g' \ 44 -e 's:${HOSTTOOLS_DIR}/mkdir:mkdir:g' \
diff --git a/meta/recipes-devtools/python/python/multilib.patch b/meta/recipes-devtools/python/python/multilib.patch
index 1116dd518e..d24bc15f01 100644
--- a/meta/recipes-devtools/python/python/multilib.patch
+++ b/meta/recipes-devtools/python/python/multilib.patch
@@ -11,7 +11,7 @@ Index: Python-2.7.14/configure.ac
11 11
12+AC_SUBST(LIB) 12+AC_SUBST(LIB)
13+AC_MSG_CHECKING(LIB) 13+AC_MSG_CHECKING(LIB)
14+LIB=`basename ${libdir}` 14+LIB="SEDMELIBLEAF"
15+AC_MSG_RESULT($LIB) 15+AC_MSG_RESULT($LIB)
16 16
17 AC_SUBST(LIBRARY) 17 AC_SUBST(LIBRARY)