From 0e371176b99c8fe73059d06708141c7b25b7d91c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 16 Sep 2025 10:37:36 +0100 Subject: [PATCH] spirv-llvm-translator: small recipe cleanup - There is no need for python3native, as this recipe doesn't depend on other python modules. - Inherit lib_package so the llvm-spirv binary is in a separate package to the libLLVMSPIRVLib.so library. - Remove obsolete CMake options that no longer appear to be required. - Change CMAKE_SKIP_RPATH to CMAKE_SKIP_BUILD_RPATH as this stops the ELF editing on install without potentially removing any explicit RPATHs, and aligns with a change I've proposed for cmake.bbclass. Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../spir/spirv-llvm-translator_21.1.0.bb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.0.bb b/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.0.bb index 63fae47377..13a93f3c5e 100644 --- a/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.0.bb +++ b/meta/recipes-graphics/spir/spirv-llvm-translator_21.1.0.bb @@ -15,19 +15,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" DEPENDS = "llvm spirv-tools spirv-headers" -inherit cmake pkgconfig python3native +inherit cmake pkgconfig lib_package -# Specify any options you want to pass to cmake using EXTRA_OECMAKE: -# for CMAKE_SHARED_LIBS=OFF see https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/1868 EXTRA_OECMAKE = "\ -DBASE_LLVM_VERSION='${@oe.utils.trim_version('${PV}', 3)}' \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_SKIP_RPATH=ON \ - -DLLVM_EXTERNAL_LIT=lit \ - -DLLVM_INCLUDE_TESTS=ON \ - -Wno-dev \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${STAGING_INCDIR}/.. \ " -- 2.47.3