From 93dec185de1efdf67dd9136830b2a0b442f5637e Mon Sep 17 00:00:00 2001 From: Randolph Sapp Date: Mon, 4 Nov 2024 14:39:08 -0600 Subject: mesa-pvr: remove dynamic-layer append for llvmpipe The mesa.inc that we inherit from oe-core now has the required parameters. This conditional append is no longer required. This reverts commit dbc6afc46e55b247606dfad5238137c8fa807843. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/layer.conf | 4 ---- .../clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend | 14 -------------- 2 files changed, 18 deletions(-) delete mode 100644 meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index 1fffb971..0d67c729 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf @@ -18,10 +18,6 @@ LAYERDEPENDS_meta-ti-bsp = " \ meta-arm \ " -BBFILES_DYNAMIC += " \ - clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \ -" - SIGGEN_EXCLUDERECIPES_ABISAFE += " \ mesa-pvr \ " diff --git a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend deleted file mode 100644 index 7e5c36fd..00000000 --- a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required -# for llvmpipe when using pvr-mesa since we aren't caught by that glob. - -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -LDFLAGS:append:toolchain-clang = " -latomic -lm" -DEPENDS:append:toolchain-clang = " libatomic-ops" - -EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false" -EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false" - -export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" - -PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils" -- cgit v1.2.3-54-g00ecf