diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index ca140d595f..ea1bc123b8 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -7,6 +7,9 @@ CVE_PRODUCT = "boost:boost" | |||
7 | ARM_INSTRUCTION_SET_armv4 = "arm" | 7 | ARM_INSTRUCTION_SET_armv4 = "arm" |
8 | ARM_INSTRUCTION_SET_armv5 = "arm" | 8 | ARM_INSTRUCTION_SET_armv5 = "arm" |
9 | 9 | ||
10 | B = "${WORKDIR}/build" | ||
11 | do_configure[cleandirs] = "${B}" | ||
12 | |||
10 | BOOST_LIBS = "\ | 13 | BOOST_LIBS = "\ |
11 | atomic \ | 14 | atomic \ |
12 | chrono \ | 15 | chrono \ |
@@ -146,7 +149,7 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" | |||
146 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ | 149 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ |
147 | ${BJAM_TOOLS} \ | 150 | ${BJAM_TOOLS} \ |
148 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ | 151 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ |
149 | --build-dir=${S}/${TARGET_SYS} \ | 152 | --build-dir=${B} \ |
150 | --disable-icu \ | 153 | --disable-icu \ |
151 | ${BJAM_EXTRA}' | 154 | ${BJAM_EXTRA}' |
152 | 155 | ||
@@ -161,6 +164,7 @@ BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" | |||
161 | BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" | 164 | BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" |
162 | 165 | ||
163 | do_configure() { | 166 | do_configure() { |
167 | cd ${S} | ||
164 | cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp | 168 | cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp |
165 | 169 | ||
166 | # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. | 170 | # D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation. |
@@ -184,8 +188,9 @@ do_configure() { | |||
184 | } | 188 | } |
185 | 189 | ||
186 | do_compile() { | 190 | do_compile() { |
187 | rm -rf ${S}/${TARGET_SYS} | 191 | cd ${S} |
188 | bjam ${BJAM_OPTS} --prefix=${prefix} \ | 192 | bjam ${BJAM_OPTS} \ |
193 | --prefix=${prefix} \ | ||
189 | --exec-prefix=${exec_prefix} \ | 194 | --exec-prefix=${exec_prefix} \ |
190 | --libdir=${libdir} \ | 195 | --libdir=${libdir} \ |
191 | --includedir=${includedir} \ | 196 | --includedir=${includedir} \ |
@@ -193,6 +198,7 @@ do_compile() { | |||
193 | } | 198 | } |
194 | 199 | ||
195 | do_install() { | 200 | do_install() { |
201 | cd ${S} | ||
196 | bjam ${BJAM_OPTS} \ | 202 | bjam ${BJAM_OPTS} \ |
197 | --libdir=${D}${libdir} \ | 203 | --libdir=${D}${libdir} \ |
198 | --includedir=${D}${includedir} \ | 204 | --includedir=${D}${includedir} \ |