Patchwork boost: set python-root correctly

login
register
mail settings
Submitter Tasslehoff Kjappfot
Date April 24, 2012, 11:14 p.m.
Message ID <1335309284-8645-1-git-send-email-tasskjapp@gmail.com>
Download mbox | patch
Permalink /patch/26383/
State New
Headers show

Comments

Koen Kooi - April 24, 2012, 11:52 a.m.
Op 25 apr. 2012, om 01:14 heeft Tasslehoff Kjappfot het volgende geschreven:

> ---
> meta/recipes-support/boost/boost.inc       |    8 +++++++-
> meta/recipes-support/boost/boost_1.49.0.bb |    2 +-
> 2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
> index c9306df..fbdf292 100644
> --- a/meta/recipes-support/boost/boost.inc
> +++ b/meta/recipes-support/boost/boost.inc
> @@ -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
> diff --git a/meta/recipes-support/boost/boost_1.49.0.bb b/meta/recipes-support/boost/boost_1.49.0.bb
> index 71fdc48..533cd10 100644
> --- a/meta/recipes-support/boost/boost_1.49.0.bb
> +++ b/meta/recipes-support/boost/boost_1.49.0.bb
> @@ -2,7 +2,7 @@ include boost.inc
> 
> LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
> 
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"

Shouldn't the INC_PR in boost.inc be increased instead?

regards,

Koen
Tasslehoff Kjappfot - April 24, 2012, 11:14 p.m.
---
 meta/recipes-support/boost/boost.inc       |    8 +++++++-
 meta/recipes-support/boost/boost_1.49.0.bb |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index c9306df..fbdf292 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -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
diff --git a/meta/recipes-support/boost/boost_1.49.0.bb b/meta/recipes-support/boost/boost_1.49.0.bb
index 71fdc48..533cd10 100644
--- a/meta/recipes-support/boost/boost_1.49.0.bb
+++ b/meta/recipes-support/boost/boost_1.49.0.bb
@@ -2,7 +2,7 @@  include boost.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://arm-intrinsics.patch"