]> code.ossystems Code Review - openembedded-core.git/commitdiff
boost: Move the do_configure_prepend to a seperate task
authorMark Hatle <mark.hatle@windriver.com>
Tue, 21 Jun 2011 00:17:29 +0000 (19:17 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 23 Jun 2011 10:54:30 +0000 (11:54 +0100)
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>
meta/recipes-support/boost/boost-36.inc

index 3adc3ed77060ad3e0981acd4be355a1bd2909a59..bc4e750a92fd23abec9b387e734bcc001f861f0a 100644 (file)
@@ -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} \