summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-06-20 19:17:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 11:54:30 +0100
commit2499777a7f16e98e1e34ea22d2e6a3409e35915b (patch)
tree91a1859ff9980714795e7b6af47f3b36e39ccc81 /meta/recipes-support
parent6a4e0a4e1f84d124e01a81b5a8563df080c7c999 (diff)
downloadopenembedded-core-contrib-2499777a7f16e98e1e34ea22d2e6a3409e35915b.tar.gz
boost: Move the do_configure_prepend to a seperate task
We need to perform those actions after patch, and before configure. Otherwise a rebuild starting with configure will fail. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/boost/boost-36.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index 3adc3ed770..bc4e750a92 100644
--- a/meta/recipes-support/boost/boost-36.inc
+++ b/meta/recipes-support/boost/boost-36.inc
@@ -9,7 +9,7 @@ SECTION = "libs"
DEPENDS = "boost-jam-native zlib"
PRIORITY = "optional"
LICENSE = "Boost"
-PR = "r3"
+PR = "r4"
ARM_INSTRUCTION_SET = "arm"
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
@@ -126,12 +126,14 @@ BJAM_OPTS = '${BJAM_TOOLS} \
${BJAM_EXTRA}'
-do_configure_prepend() {
+do_boostconfig() {
cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam
}
+addtask do_boostconfig after do_patch before do_configure
+
do_compile() {
set -ex
bjam ${BJAM_OPTS} --prefix=${prefix} \