From 9633eebe1d0f487164ac0da9787e224bcb497e7f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 20 Jun 2011 19:17:29 -0500 Subject: 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. (From OE-Core rev: 2499777a7f16e98e1e34ea22d2e6a3409e35915b) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-support/boost/boost-36.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-support/boost') 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} \ -- cgit v1.2.3-54-g00ecf