summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-09-08 11:42:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-09 14:09:01 +0100
commit22a6ff07aa4814270d423ba979e5dbfd10a05caa (patch)
tree1e4a6121d10278fdca5890b093c5d9b2348d5c52
parente2a1c8bc312c3a61a312fe286b4e36825a7ff787 (diff)
downloadpoky-22a6ff07aa4814270d423ba979e5dbfd10a05caa.tar.gz
boost: Refrain bjam from poking into host includes
bjam's logic to find icu during build time tries to poke at /usr/ for various files and it succeeds for 32bit target build on my host and it adds -I/usr/inclue to search paths because I do have icu installed on build host in /usr/lib and /usr/include but does not succeed for 64-bit target builds because its searching for same in /usr/lib64 on 32-bit log_dompile shows - icu : yes [5] on 64 bit - icu : no [2] On 64bit its getting lucky because the test is failing due to mismatches in size of 'uintptr_t' since its reading half the headers from build host and remaining from target C++ library. In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/boost_1_80_0/libs/locale/build/has_icu_test.cpp:7: In file included from /usr/include/unicode/locid.h:38: In file included from /usr/include/unicode/bytestream.h:45: In file included from /usr/include/unicode/std_string.h:37: In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/recipe-sysroot/usr/include/c++/v1/string:549: In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/recipe-sysroot/usr/include/c++/v1/memory:853: In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/recipe-sysroot/usr/include/c++/v1/__memory/compressed_pair.h:16: In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/recipe-sysroot/usr/include/c++/v1/tuple:226: /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/boost/1.80.0-r0/recipe-sysroot/usr/include/c++/v1/typeinfo:247:14: error: cast from pointer to smaller type 'std::__type_info_implementations::__non_unique_arm_rtti_bit_impl::__type_name_t' (aka 'unsigned int') loses information return reinterpret_cast<__type_name_t>(__v); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Therefore, help bjam avoid peeking into build system includes entirely. now if ICU is staged in sysroot it will look there for all headers. Look into libs/locale/build/Jamfile.v2 after 'Xlocale' section if you seek further information (From OE-Core rev: 0a87f700ed52434bf5055db25dc4ad427d83cc22) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/boost/boost.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 402f1592cf..4263e645de 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -151,6 +151,7 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}"
151BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ 151BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
152 ${BJAM_TOOLS} \ 152 ${BJAM_TOOLS} \
153 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ 153 -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
154 -sICU_PATH=${STAGING_EXECPREFIXDIR} \
154 --build-dir=${B} \ 155 --build-dir=${B} \
155 --disable-icu \ 156 --disable-icu \
156 ${BJAM_EXTRA}' 157 ${BJAM_EXTRA}'