From 4abd6ee9d480437010e589ce215e20b835d3dad4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 10 Oct 2021 21:10:06 +0200 Subject: rust-common.bbclass: rewrite toolchain wrappers in (native) python librsvg on centos 7 and friends exhibits the same libtinfo leakage problem, this time coming from the compiler and not the linker. Simply covering the compiler by the existing C wrapper-of-wrapper does not work, as rust-native builds put Important Stuff into LD_LIBRARY_PATH and unsetting it breaks things badly. Rather than try to figure out which combination of wrappers and LD_LIBRARY_PATH settings works for which situation, or provide some kind of sh-native, let's simply use python3-native for the wrappers, which should insulate builds from the the host shell. rust-native already depends on python3-native, so this does not lengthen the builds. This also reverts: rust-common: Hack around LD_LIBRARY_PATH issues on centos7 (commit 63b1fd2226b5f146d6c853cc57417704df378438). I'd also like to say boo to Red Hat (or GNU?) for breaking ABI compatibility for stat() in glibc 2.33, we ended up sorting this mess because of it. (From OE-Core rev: 997d54363a3cb3a0e949b3626855f2fa41afeb2b) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/files/rust-ccld-wrapper.c | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 meta/files/rust-ccld-wrapper.c (limited to 'meta/files/rust-ccld-wrapper.c') diff --git a/meta/files/rust-ccld-wrapper.c b/meta/files/rust-ccld-wrapper.c deleted file mode 100644 index 6bc9958b90..0000000000 --- a/meta/files/rust-ccld-wrapper.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021 Richard Purdie - * - * SPDX-License-Identifier: GPL-2.0-only - */ - -#include -#include -#include -#include -#include - -/* - * Run the original script (argv[0] + ".real") with LD_LIBRARY_PATH unset - * This avoids issues where cargo is running a wrapper script using /bin/sh from the host - * which links to something which has an incompatible version in in recipe-sysroot-native - * such as libtinfo on centos 7. - */ - -int main(int argc, char* argv[]) { - char *real = malloc(strlen(argv[0] + 5)); - strcpy(real, argv[0]); - strcpy(real + strlen(argv[0]), ".real"); - putenv("LD_LIBRARY_PATH="); - if(execv(real, argv) == -1) { - printf("Wrapper failed to execute, error: %s\n", strerror(errno)); - return -1; - } -} -- cgit v1.2.3-54-g00ecf