From ab6fddacba8eb6b72c8be4d69f6988b61d7b32e1 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Thu, 13 Mar 2014 10:01:54 +0000 Subject: 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 "the flags" "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 Signed-off-by: Richard Purdie (cherry picked from commit f09d2583894be0a4069600381046bec5e7f0277b) Signed-off-by: Andreas Oberritter --- meta/recipes-support/boost/boost.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index f13051c454..caa1015043 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}" "${CXXFLAGS}" "${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 -- cgit 1.2.3-korg