summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-05-14 13:41:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:08 +0100
commitc495dccf581d15ea63a21aed089abdb4609dd6e7 (patch)
tree667fed467db5b8b61e8c29aaabb997e42587145c
parent8fc71f42478afeb414dc09c4ffe43b2ddd07a276 (diff)
downloadpoky-c495dccf581d15ea63a21aed089abdb4609dd6e7.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) (From OE-Core rev: f055d084ad74a01a431ea87ead6bfdcaca0d7bde) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc10
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 = ""
60ALLOW_EMPTY_${PN} = "1" 60ALLOW_EMPTY_${PN} = "1"
61 61
62# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works 62# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
63TARGET_CC_ARCH += " ${LDFLAGS}" 63TARGET_CC_ARCH += "${LDFLAGS}"
64 64
65# Oh yippee, a new build system, it's sooo cooool I could eat my own 65# Oh yippee, a new build system, it's sooo cooool I could eat my own
66# foot. inlining=on lets the compiler choose, I think. At least this 66# foot. inlining=on lets the compiler choose, I think. At least this
@@ -143,11 +143,9 @@ do_boostconfig() {
143 cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp 143 cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
144 144
145 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. 145 # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation.
146 if ! grep -qe "^using gcc : 4.3.1" ${S}/tools/build/example/user-config.jam 146 sed -i "/^using gcc : 4.3.1/d" ${S}/tools/build/example/user-config.jam
147 then 147 sed -i "/^using python : ${PYTHON_BASEVERSION}"/d ${S}/tools/build/example/user-config.jam
148 echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam 148 echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/example/user-config.jam
149 fi
150
151 echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam 149 echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/example/user-config.jam
152 150
153 CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT} 151 CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc --with-python-root=${PYTHON_ROOT}