summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>2015-12-07 08:36:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-09 08:48:25 +0000
commit27b9f041df92fd8438962c2104a7a5d9dff77ce5 (patch)
tree11975b658ea5c29bb91a7b0bd01889450317fec5
parent639cadd6f9a1ec795443081d7f1ca1ab530d385a (diff)
downloadpoky-27b9f041df92fd8438962c2104a7a5d9dff77ce5.tar.gz
poky-27b9f041df92fd8438962c2104a7a5d9dff77ce5.tar.bz2
poky-27b9f041df92fd8438962c2104a7a5d9dff77ce5.zip
boost: adjust hard-coded path after python3 upgrade
When using `PACKAGECONFIG = "python"` in the boost recipe, `bitbake boost` fails at do_compile with: ./boost/python/detail/wrap_python.hpp:50:23: fatal error: pyconfig.h: No such file or directory compilation terminated. This issue is due to the recent version upgrade from python 3.4 to 3.5: 701ec1977ced1bb08461e6de98b4f63d21cba8a6 python3: Upgrade from 3.4.3 to 3.5 The boost.inc file modifies the boost build configuration with a path containing the python3 major version, which is hard-coded in the boost.inc file. Hence after the python3 update, the path points to the outdated location and it needs to be updated to the new location. This issue was unrevealed by an internal continuous integration system for the meta-ros application layer. Further manual bisecting lead to the critical commit 701ec1977ced1bb08461e6de98b4f63d21cba8a6. (From OE-Core rev: 0eefd38a13a6ecb35f26ed8cd16f0b36f2c5d652) Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index a1b434d86c..9d7fb895ca 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -155,7 +155,7 @@ do_boostconfig() {
sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam
echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam
echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam
- echo "using python : 3.4 : : ${STAGING_INCDIR}/python3.4m ;" >> ${S}/tools/build/example/user-config.jam
+ echo "using python : 3.5 : : ${STAGING_INCDIR}/python3.5m ;" >> ${S}/tools/build/example/user-config.jam
CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT}
sed -i '/^using python/d' project-config.jam