diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2015-05-14 13:41:26 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:41:54 +0100 |
| commit | f055d084ad74a01a431ea87ead6bfdcaca0d7bde (patch) | |
| tree | 3470bd5194d1544a72d94bce5727203194e3b850 /meta/recipes-support | |
| parent | fdcbbb50a9946733bd204b8db45606c929e43822 (diff) | |
| download | openembedded-core-f055d084ad74a01a431ea87ead6bfdcaca0d7bde.tar.gz | |
boost: properly fix do_boostconfig re-execution
* it was partially fixed in:
commit 291e20a51544c640d07767d1dc32d762f4370f41
Author: Venkata ramana gollamudi <ramana.gollamudi@huawei.com>
Date: Fri Apr 13 11:42:46 2012 +0000
Subject: boost: fix re-execution of task
but with disadvantage that when CXX or *FLAGS variables were changed
it was continuing to use old values
* just remove the line before appending it with current values to fix
that
(From OE-Core rev: 8ce9584a78079b3db88eabfa902025a94443378d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 6b42133aed..33f9810aae 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -60,7 +60,7 @@ RRECOMMENDS_${PN}_class-native = "" ALLOW_EMPTY_${PN} = "1" # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works -TARGET_CC_ARCH += " ${LDFLAGS}" +TARGET_CC_ARCH += "${LDFLAGS}" # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this @@ -143,11 +143,9 @@ do_boostconfig() { cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. - if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/example/user-config.jam - then - echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam - fi - + sed -i "/^using gcc : 4.3.1/d" ${S}/tools/build/example/user-config.jam + sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam + echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} |