summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2014-03-13 10:01:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-17 14:01:07 +0000
commitf09d2583894be0a4069600381046bec5e7f0277b (patch)
tree61444223d8d676c6a548528c5c51f5150fb9a801
parent55f596fdfdacd3f5eeabdcabd62545b2d583cc2e (diff)
downloadopenembedded-core-f09d2583894be0a4069600381046bec5e7f0277b.tar.gz
openembedded-core-f09d2583894be0a4069600381046bec5e7f0277b.tar.bz2
openembedded-core-f09d2583894be0a4069600381046bec5e7f0277b.zip
boost: Pass CFLAGS, CXXFLAGS and LDFLAGS correctly into boost.build
The compileflags and linkflags do_boostconfig puts into user-config.jam are having no effect. According to http://www.boost.org/boost-build2/doc/html/bbv2/reference/tools.html the correct syntax would be <compileflags>"the flags" <linkflags>"the flags". Since the flags specified were having no effect they can't be necessary and can be safely removed. We should be passing ${CFLAGS}, ${CXXFLAGS} and ${LDFLAGS} instead so that users of the recipe can pass arbitrary flags as they choose. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index c7642befa4..356ca22f4a 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -134,7 +134,7 @@ do_boostconfig() {
# 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/v2/user-config.jam
then
- 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} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${S}/tools/build/v2/user-config.jam
fi
echo "using python : ${PYTHON_BASEVERSION} : : ${STAGING_INCDIR}/python${PYTHON_BASEVERSION} ;" >> ${S}/tools/build/v2/user-config.jam