vulkan-validation-layers: cleanup recipe

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.

(From OE-Core rev: 681b9294218c29dab7f524ecbfa32c28345af278)

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Vincent Davis Jr
2023-06-14 01:45:20 -05:00
committed by Richard Purdie
parent 6f1867ac50
commit 860b98fc81

View File

@@ -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 = ""