diff options
Diffstat (limited to 'meta/recipes-support/boost/boost.inc')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 10 |
1 files changed, 8 insertions, 2 deletions
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("."))}" | |||
16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" | 16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" |
17 | BOOST_P = "boost_${BOOST_VER}" | 17 | BOOST_P = "boost_${BOOST_VER}" |
18 | 18 | ||
19 | INC_PR = "r2" | 19 | INC_PR = "r3" |
20 | 20 | ||
21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" | 21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" |
22 | 22 | ||
@@ -42,7 +42,7 @@ BOOST_LIBS = "\ | |||
42 | #BOOST_LIBS += "python" | 42 | #BOOST_LIBS += "python" |
43 | #DEPENDS += "python" | 43 | #DEPENDS += "python" |
44 | #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" | 44 | #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" |
45 | #PYTHON_VERSION = "2.5" | 45 | #PYTHON_VERSION = "2.7" |
46 | 46 | ||
47 | # Make a package for each library, plus -dev | 47 | # Make a package for each library, plus -dev |
48 | PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" | 48 | PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" |
@@ -123,6 +123,7 @@ BJAM_TOOLS = "-sTOOLS=gcc \ | |||
123 | '-sNO_ZLIB=1' \ | 123 | '-sNO_ZLIB=1' \ |
124 | '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ | 124 | '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ |
125 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ | 125 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ |
126 | '-sPYTHON_ROOT=${PYTHON_ROOT}' \ | ||
126 | '--layout=system' \ | 127 | '--layout=system' \ |
127 | " | 128 | " |
128 | 129 | ||
@@ -140,6 +141,11 @@ do_boostconfig() { | |||
140 | then | 141 | then |
141 | echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam | 142 | echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam |
142 | fi | 143 | fi |
144 | |||
145 | echo "using python : ${PYTHON_VERSION} : : ${STAGING_INCDIR}/python${PYTHON_VERSION} ;" >> ${S}/tools/build/v2/user-config.jam | ||
146 | |||
147 | CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-toolset=gcc --with-python-root=${PYTHON_ROOT} | ||
148 | sed -i '/^using python/d' project-config.jam | ||
143 | } | 149 | } |
144 | 150 | ||
145 | addtask do_boostconfig after do_patch before do_configure | 151 | addtask do_boostconfig after do_patch before do_configure |