mirror of
https://git.yoctoproject.org/poky
synced 2026-09-13 09:49:32 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
745fffc5c2
commit
9633eebe1d
@@ -9,7 +9,7 @@ SECTION = "libs"
|
|||||||
DEPENDS = "boost-jam-native zlib"
|
DEPENDS = "boost-jam-native zlib"
|
||||||
PRIORITY = "optional"
|
PRIORITY = "optional"
|
||||||
LICENSE = "Boost"
|
LICENSE = "Boost"
|
||||||
PR = "r3"
|
PR = "r4"
|
||||||
|
|
||||||
ARM_INSTRUCTION_SET = "arm"
|
ARM_INSTRUCTION_SET = "arm"
|
||||||
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
|
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
|
||||||
@@ -126,12 +126,14 @@ BJAM_OPTS = '${BJAM_TOOLS} \
|
|||||||
${BJAM_EXTRA}'
|
${BJAM_EXTRA}'
|
||||||
|
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_boostconfig() {
|
||||||
cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
|
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
|
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() {
|
do_compile() {
|
||||||
set -ex
|
set -ex
|
||||||
bjam ${BJAM_OPTS} --prefix=${prefix} \
|
bjam ${BJAM_OPTS} --prefix=${prefix} \
|
||||||
|
|||||||
Reference in New Issue
Block a user