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>

diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 979b601bf1b22e5283b924b84dff8b7777d7cf5f..84bcb6aa8a6db27a8f9bc7f16fa4b2fde46baf91 100644 (file)
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -33,6 +33,12 @@ EXTRA_OECONF = "\
   ${PYTHONLSBOPTS} \
 "
 
+do_configure_prepend() {
+       libdirleaf="$(echo ${libdir} | sed -e 's:${prefix}/::')"
+       sed -i -e "s:SEDMELIBLEAF:${libdirleaf}:g" \
+               ${S}/configure.ac
+}
+
 do_install_append () {
        sed -i -e 's:${HOSTTOOLS_DIR}/install:install:g' \
                -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 1116dd518e49cf3163189b30141be65513d6e888..d24bc15f013e5b2b8c59c9b43f55008d85da7e7b 100644 (file)
--- 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
  
 +AC_SUBST(LIB)
 +AC_MSG_CHECKING(LIB)
-+LIB=`basename ${libdir}`
++LIB="SEDMELIBLEAF"
 +AC_MSG_RESULT($LIB)
  
  AC_SUBST(LIBRARY)