Commit doesn't change build behavior * Removes ${libdir} from FILES:${PN} as its not required. * Updates PACKAGECONFIG to uses just one @bb.utils.filter call. * Updates GLSLANG_INSTALL_DIR to <recipe-sysroot>/lib${64} as that contains the actual directory of the glslang .cmake config files.
Signed-off-by: Vincent Davis Jr <vi...@underview.tech> --- .../vulkan/vulkan-validation-layers_1.3.243.0.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb index 6e1ef7a05d..bfb4b370b8 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb @@ -23,7 +23,7 @@ DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang" EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ - -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ + -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ " @@ -31,14 +31,11 @@ EXTRA_OECMAKE = "\ PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr" PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" -PACKAGECONFIG ?= "\ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ - " +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" inherit cmake features_check pkgconfig -FILES:${PN} += "${datadir}/vulkan ${libdir}" +FILES:${PN} += "${datadir}/vulkan" SOLIBS = ".so" FILES_SOLIBSDEV = "" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#182734): https://lists.openembedded.org/g/openembedded-core/message/182734 Mute This Topic: https://lists.openembedded.org/mt/99522873/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-