diff options
author | Vincent Davis Jr <vince@underview.tech> | 2023-06-14 01:45:20 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-15 09:53:38 +0100 |
commit | 860b98fc81b0f25ee9e8db3f6e04a8c4f5bb51f3 (patch) | |
tree | d1ae38f480b0eff5fc868306c6d5bb2fa3ca9163 | |
parent | 6f1867ac50e36eaa2527ea0ed836ef8a585fde55 (diff) | |
download | poky-860b98fc81b0f25ee9e8db3f6e04a8c4f5bb51f3.tar.gz |
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>
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb | 9 |
1 files 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" | |||
23 | EXTRA_OECMAKE = "\ | 23 | EXTRA_OECMAKE = "\ |
24 | -DBUILD_TESTS=OFF \ | 24 | -DBUILD_TESTS=OFF \ |
25 | -DUSE_ROBIN_HOOD_HASHING=OFF \ | 25 | -DUSE_ROBIN_HOOD_HASHING=OFF \ |
26 | -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ | 26 | -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ |
27 | -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ | 27 | -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ |
28 | -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ | 28 | -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ |
29 | " | 29 | " |
@@ -31,14 +31,11 @@ EXTRA_OECMAKE = "\ | |||
31 | 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" | 31 | 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" |
32 | PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" | 32 | PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland" |
33 | 33 | ||
34 | PACKAGECONFIG ?= "\ | 34 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" |
35 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | ||
36 | ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ | ||
37 | " | ||
38 | 35 | ||
39 | inherit cmake features_check pkgconfig | 36 | inherit cmake features_check pkgconfig |
40 | 37 | ||
41 | FILES:${PN} += "${datadir}/vulkan ${libdir}" | 38 | FILES:${PN} += "${datadir}/vulkan" |
42 | 39 | ||
43 | SOLIBS = ".so" | 40 | SOLIBS = ".so" |
44 | FILES_SOLIBSDEV = "" | 41 | FILES_SOLIBSDEV = "" |