summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTasslehoff Kjappfot <tasskjapp@gmail.com>2012-04-25 02:12:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-24 17:49:07 +0100
commit7bd803c9535afe5933d41f92da5208ae773e2abb (patch)
tree6fe948e2ab98a5cfc169a4a9e77593e13d24cc3b
parentc7809c03080925b5e9171df5c9175c7c6420b376 (diff)
downloadopenembedded-core-7bd803c9535afe5933d41f92da5208ae773e2abb.tar.gz
openembedded-core-7bd803c9535afe5933d41f92da5208ae773e2abb.tar.bz2
openembedded-core-7bd803c9535afe5933d41f92da5208ae773e2abb.tar.xz
openembedded-core-7bd803c9535afe5933d41f92da5208ae773e2abb.zip
boost: set python-root correctly
[RP: Fix whitespace] Signed-off-by: Tasslehoff Kjappfot <tasskjapp@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index c9306df94..e5ea10dc0 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 <optimization>space <threading>multi <inlining>on <debug-symbols>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