diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-06-20 19:17:29 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 12:07:31 +0100 |
commit | 9633eebe1d0f487164ac0da9787e224bcb497e7f (patch) | |
tree | 9ae8b0259222741bb727cf21aa46c412a08c2c24 /meta/recipes-support/boost | |
parent | 745fffc5c2e79729bc2a574b7011ea712ed23033 (diff) | |
download | poky-9633eebe1d0f487164ac0da9787e224bcb497e7f.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.
(From OE-Core rev: 2499777a7f16e98e1e34ea22d2e6a3409e35915b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-36.inc | 6 |
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" | |||
9 | DEPENDS = "boost-jam-native zlib" | 9 | DEPENDS = "boost-jam-native zlib" |
10 | PRIORITY = "optional" | 10 | PRIORITY = "optional" |
11 | LICENSE = "Boost" | 11 | LICENSE = "Boost" |
12 | PR = "r3" | 12 | PR = "r4" |
13 | 13 | ||
14 | ARM_INSTRUCTION_SET = "arm" | 14 | ARM_INSTRUCTION_SET = "arm" |
15 | BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" | 15 | BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" |
@@ -126,12 +126,14 @@ BJAM_OPTS = '${BJAM_TOOLS} \ | |||
126 | ${BJAM_EXTRA}' | 126 | ${BJAM_EXTRA}' |
127 | 127 | ||
128 | 128 | ||
129 | do_configure_prepend() { | 129 | do_boostconfig() { |
130 | cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp | 130 | cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp |
131 | 131 | ||
132 | echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam | 132 | echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam |
133 | } | 133 | } |
134 | 134 | ||
135 | addtask do_boostconfig after do_patch before do_configure | ||
136 | |||
135 | do_compile() { | 137 | do_compile() { |
136 | set -ex | 138 | set -ex |
137 | bjam ${BJAM_OPTS} --prefix=${prefix} \ | 139 | bjam ${BJAM_OPTS} --prefix=${prefix} \ |