Patchwork [40/40] boost: Move the do_configure_prepend to a seperate task

login
register
mail settings
Submitter Mark Hatle
Date June 22, 2011, 5:36 p.m.
Message ID <b1f05da57a7748cb92cb6c690187a4b990401124.1308763995.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/6325/
State New, archived
Headers show

Comments

Mark Hatle - June 22, 2011, 5:36 p.m.
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 |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc
index 3adc3ed..bc4e750 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} \