From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 5 Aug 2022 11:50:13 +0000 (+0100)
Subject: rust/mesa: Drop obsolete YOCTO_ALTERNATE_MULTILIB_NAME
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3419
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35e1ecf88cf9725e1ba43c948e90359df983002f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rust/mesa: Drop obsolete YOCTO_ALTERNATE_MULTILIB_NAME

This variable is no longer used by the llvm patches.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index 47b76e725de..7d1f5347ea7 100644
--- a/meta/recipes-devtools/rust/rust.inc
+++ b/meta/recipes-devtools/rust/rust.inc
@@ -20,8 +20,6 @@ export FORCE_CRATE_HASH="${BB_TASKHASH}"
 RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config"
 RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config"
 
-export YOCTO_ALTERNATE_MULTILIB_NAME = "/${BASELIB}"
-
 # We don't want to use bitbakes vendoring because the rust sources do their
 # own vendoring.
 CARGO_DISABLE_BITBAKE_VENDORING = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index f02ef2dc2bf..7e46fd9c15f 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -56,7 +56,6 @@ ANY_OF_DISTRO_FEATURES:class-target = "opengl vulkan"
 PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
 
 export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
-export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
 export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
 export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"