From 720dd065a4626af7d7a18e941aa090a923e060cd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 16 Sep 2025 10:37:37 +0100 Subject: [PATCH] spirv-tools: improve packaging spirv-tools is a set of libraries and some binaries that link to those libraries, so inherit lib_package so that the binaries and the libraries are packaged separately. The lesspipe script hasn't needed bash since 2018[1], so remove the bash dependency and package the script with the other binaries. The build type unless specified is Debug, explicitly set RelWithDebInfo. [1] spirv-tools f70e9e "tools/lesspipe: Allow generic shell (#2255)" Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb index 30c42e915f9..c3e0d17d87a 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.4.321.0.bb @@ -19,11 +19,12 @@ PE = "1" # upstream considers a release. UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" -inherit cmake +inherit cmake lib_package DEPENDS = "spirv-headers" EXTRA_OECMAKE += "\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ -DSPIRV_TOOLS_BUILD_STATIC=OFF \ -DBUILD_SHARED_LIBS=ON \ @@ -46,8 +47,4 @@ do_install:append:class-target() { SOLIBS = ".so" FILES_SOLIBSDEV = "" -PACKAGES =+ "${PN}-lesspipe" -FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" -RDEPENDS:${PN}-lesspipe += "${PN} bash" - BBCLASSEXTEND = "native nativesdk" -- 2.47.3