]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
boost: Refrain bjam from poking into host includes
authorKhem Raj <raj.khem@gmail.com>
Thu, 8 Sep 2022 18:42:59 +0000 (11:42 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 9 Sep 2022 13:08:28 +0000 (14:08 +0100)
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/boost/boost.inc

index 402f1592cfde4118a8a7b504eba3df61c3b0540e..4263e645de1cf5eef21292461c40ba3490476a7e 100644 (file)
@@ -151,6 +151,7 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}"
 BJAM_OPTS    = '${BOOST_PARALLEL_MAKE} -d+2 -q \
                ${BJAM_TOOLS} \
                -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
+               -sICU_PATH=${STAGING_EXECPREFIXDIR} \
                --build-dir=${B} \
                --disable-icu \
                ${BJAM_EXTRA}'