diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-01 15:28:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-02 21:22:25 +0100 |
| commit | 8feeeb7f76c6725e5226458c8f22999b67c52694 (patch) | |
| tree | 9bea0e1ad9a801e3e9a924888eedcac22ac24719 /meta/classes/rust-common.bbclass | |
| parent | e3cb3958cc14672feef5d4d8953131f55db68573 (diff) | |
| download | openembedded-core-contrib-8feeeb7f76c6725e5226458c8f22999b67c52694.tar.gz | |
rust-common: Hack around LD_LIBRARY_PATH issues on centos7
When building cargo-native on centos7 with buildtools tarball installed,
we see failures:
/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /home/pokybuild/yocto-worker/reproducible-centos/build/build-st/tmp/work/x86_64-linux/cargo-native/1.54.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5)
We also see this for libstd-rs once cargo-native is fixed.
The reason for this is that the wrapper script
cargo-native/1.54.0-r0/wrapper/target-rust-ccld has /bin/sh as it's
interpreter and cargo calls this with LD_LIBRARY_PATH set to include the
recipe-sysroot-native. The host /bin/sh links to libtinfo from the host
but it finds the version in the sysroot which needs a newer libc. This
results in the above error since the loader is an older libc and the two
are incompatible.
Our ccld wrapper calls gcc/ld which don't need the LD_LIBRARY_PATH
variable set. We can't patch this out the source since we're using
a prebuilt binary to generate a new cargo binary so this is impossible
to bootstrap.
Instead, put a binary wrapper into place which removes LD_LIBRARY_PATH
from the environment before calling the original wrapper (left in shell
as it is simpler to maintain).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rust-common.bbclass')
| -rw-r--r-- | meta/classes/rust-common.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass index e1bc0193c3..a8803d61b6 100644 --- a/meta/classes/rust-common.bbclass +++ b/meta/classes/rust-common.bbclass @@ -169,6 +169,11 @@ do_rust_create_wrappers () { # Yocto Target / Rust Target archiver create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}" + # Need to filter out LD_LIBRARY_PATH from the linker without using shell + mv ${RUST_BUILD_CCLD} ${RUST_BUILD_CCLD}.real + ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_BUILD_CCLD} + mv ${RUST_TARGET_CCLD} ${RUST_TARGET_CCLD}.real + ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_TARGET_CCLD} } addtask rust_create_wrappers before do_configure after do_patch |