From f03dccc7ecc053ea714dac8078b578b6f1a4e0dd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Apr 2018 15:00:21 +0200 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python.inc | 6 ++++++ meta/recipes-devtools/python/python/multilib.patch | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 = "\ ${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 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 +AC_SUBST(LIB) +AC_MSG_CHECKING(LIB) -+LIB=`basename ${libdir}` ++LIB="SEDMELIBLEAF" +AC_MSG_RESULT($LIB) AC_SUBST(LIBRARY) -- cgit v1.2.3-54-g00ecf