From 77a3de5ff0441da2366ae029e8427ea53ad79b79 Mon Sep 17 00:00:00 2001 From: Tasslehoff Kjappfot Date: Wed, 25 Apr 2012 02:12:04 +0200 Subject: boost: set python-root correctly [RP: Fix whitespace] (From OE-Core rev: 7bd803c9535afe5933d41f92da5208ae773e2abb) Signed-off-by: Tasslehoff Kjappfot Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index c9306df94f..e5ea10dc01 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -INC_PR = "r2" +INC_PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" @@ -42,7 +42,7 @@ BOOST_LIBS = "\ #BOOST_LIBS += "python" #DEPENDS += "python" #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" -#PYTHON_VERSION = "2.5" +#PYTHON_VERSION = "2.7" # Make a package for each library, plus -dev PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" @@ -123,6 +123,7 @@ BJAM_TOOLS = "-sTOOLS=gcc \ '-sNO_ZLIB=1' \ '-sBUILD=release space multi on off' \ '-sPYTHON_VERSION=${PYTHON_VERSION}' \ + '-sPYTHON_ROOT=${PYTHON_ROOT}' \ '--layout=system' \ " @@ -140,6 +141,11 @@ do_boostconfig() { then echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam fi + + echo "using python : ${PYTHON_VERSION} : : ${STAGING_INCDIR}/python${PYTHON_VERSION} ;" >> ${S}/tools/build/v2/user-config.jam + + CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-toolset=gcc --with-python-root=${PYTHON_ROOT} + sed -i '/^using python/d' project-config.jam } addtask do_boostconfig after do_patch before do_configure -- cgit v1.2.3-54-g00ecf