summaryrefslogtreecommitdiffstats
path: root/meta/classes/rust-common.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-01 14:28:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-02 20:22:54 (GMT)
commit63b1fd2226b5f146d6c853cc57417704df378438 (patch)
treee31c04a62f47f317feb0f7296a78446425e7719b /meta/classes/rust-common.bbclass
parent640136a72b3bb6f832b08ca0e12f774c925d36c8 (diff)
downloadpoky-63b1fd2226b5f146d6c853cc57417704df378438.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). (From OE-Core rev: 8feeeb7f76c6725e5226458c8f22999b67c52694) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rust-common.bbclass')
-rw-r--r--meta/classes/rust-common.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/rust-common.bbclass b/meta/classes/rust-common.bbclass
index e1bc019..a8803d6 100644
--- a/meta/classes/rust-common.bbclass
+++ b/meta/classes/rust-common.bbclass
@@ -169,6 +169,11 @@ do_rust_create_wrappers () {
169 # Yocto Target / Rust Target archiver 169 # Yocto Target / Rust Target archiver
170 create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}" 170 create_wrapper "${RUST_TARGET_AR}" "${WRAPPER_TARGET_AR}"
171 171
172 # Need to filter out LD_LIBRARY_PATH from the linker without using shell
173 mv ${RUST_BUILD_CCLD} ${RUST_BUILD_CCLD}.real
174 ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_BUILD_CCLD}
175 mv ${RUST_TARGET_CCLD} ${RUST_TARGET_CCLD}.real
176 ${BUILD_CC} ${COREBASE}/meta/files/rust-ccld-wrapper.c -o ${RUST_TARGET_CCLD}
172} 177}
173 178
174addtask rust_create_wrappers before do_configure after do_patch 179addtask rust_create_wrappers before do_configure after do_patch