summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-08 15:33:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-08 15:46:03 +0100
commit0f24ffd4dec2e0b7731fa731cd78a88363d3bafe (patch)
tree522678ef89ba1eb19782fc7db2879a8befbc0e28
parent6224a3b2b0e552ee4f8ab4d633a9e619e41a39eb (diff)
downloadopenembedded-core-contrib-0f24ffd4dec2e0b7731fa731cd78a88363d3bafe.tar.gz
cargo: Work around host system library conflicts
cargo ends up running target-rust-ccld with LD_LIBRARY_PATH set to libdir but not base_libdir which breaks the SDK. You see errors like: /bin/sh: error while loading shared libraries: libncurses.so.5: cannot open shared object file: No such file or directory On such a system, this would fail: LD_LIBRARY_PATH="<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/usr/lib" cargo build but this would work: LD_LIBRARY_PATH="<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/usr/lib:<path>/testimage-sdk/sysroots/x86_64-pokysdk-linux/lib" cargo build so wrap cargo with both paths in LD_LIBRARY_PATH. The error depends on the versions of the host system, it reproduced on tumbleweed-ty-3. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cargo/cargo.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cargo/cargo.inc b/meta/recipes-devtools/cargo/cargo.inc
index e34554a9d7..636e9c4fe5 100644
--- a/meta/recipes-devtools/cargo/cargo.inc
+++ b/meta/recipes-devtools/cargo/cargo.inc
@@ -43,6 +43,14 @@ do_install () {
install -m 755 "${B}/target/${CARGO_TARGET_SUBDIR}/cargo" "${D}${bindir}"
}
+do_install:append:class-nativesdk() {
+ # To quote the cargo docs, "Cargo also sets the dynamic library path when compiling
+ # and running binaries with commands like `cargo run` and `cargo test`". Sadly it
+ # sets to libdir but not base_libdir leading to symbol mismatches depending on the
+ # host OS. Fully set LD_LIBRARY_PATH to contain both to avoid this.
+ create_wrapper ${D}/${bindir}/cargo LD_LIBRARY_PATH=${libdir}:${base_libdir}
+}
+
# Disabled due to incompatibility with libgit2 0.28.x (https://github.com/rust-lang/git2-rs/issues/458, https://bugs.gentoo.org/707746#c1)
# as shipped by Yocto Dunfell.
# According to https://github.com/rust-lang/git2-rs/issues/458#issuecomment-522567539, there are no compatibility guarantees between