summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rust/rust.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
2 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc
index 47b76e725d..7d1f5347ea 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}"
20RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config" 20RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config"
21RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config" 21RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config"
22 22
23export YOCTO_ALTERNATE_MULTILIB_NAME = "/${BASELIB}"
24
25# We don't want to use bitbakes vendoring because the rust sources do their 23# We don't want to use bitbakes vendoring because the rust sources do their
26# own vendoring. 24# own vendoring.
27CARGO_DISABLE_BITBAKE_VENDORING = "1" 25CARGO_DISABLE_BITBAKE_VENDORING = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index f02ef2dc2b..7e46fd9c15 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"
56PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" 56PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
57 57
58export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" 58export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
59export YOCTO_ALTERNATE_MULTILIB_NAME = "${base_libdir}"
60export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}" 59export LLVM_CONFIG = "${STAGING_BINDIR_NATIVE}/llvm-config${MESA_LLVM_RELEASE}"
61export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" 60export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
62 61