Patchwork boost: set python-root correctly

login
register
mail settings
Submitter Tasslehoff Kjappfot
Date April 25, 2012, 12:12 a.m.
Message ID <1335312724-27599-1-git-send-email-tasskjapp@gmail.com>
Download mbox | patch
Permalink /patch/26385/
State New
Headers show

Comments

Tasslehoff Kjappfot - April 25, 2012, 12:12 a.m.
Signed-off-by: Tasslehoff Kjappfot <tasskjapp@gmail.com>
---
 meta/recipes-support/boost/boost.inc |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Saul Wold - April 27, 2012, 9:05 p.m.
On 04/24/2012 05:12 PM, Tasslehoff Kjappfot wrote:
>
> Signed-off-by: Tasslehoff Kjappfot<tasskjapp@gmail.com>
> ---
>   meta/recipes-support/boost/boost.inc |   10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
> index c9306df..5341a8c 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


Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index c9306df..5341a8c 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