From 9d8c8dcfab8ddaec2ea8ee7cd125af2dc130d27c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 13 Jun 2023 12:55:58 -0700 Subject: vulkan-validation-layers: Fix do_configure failure The build does fail in do_configure: ``` | CMake Error at /opt/work/upstream/fsl-xwayland/tmp/work/cortexa72-cortexa53-crypto-mx8-fsl-linux/vulkan-validation-layers/1.2.182.0.imx-r0/recipe-sysroot-native/usr/share/cmake-3.26/Modules/FindPackageHandleStandardArgs.cmake:230 (message): | Could NOT find VulkanHeaders (missing: VulkanHeaders_INCLUDE_DIR) Updating EXTRA_OECMAKE to match the upstream recipe does fix the configure error ``` Checking the upstream recipe, there are three changes in `EXTRA_OECMAKE`. Aligning those does fix the failure. Signed-off-by: Tom Hochstein --- recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb index da834e625..d72a22f52 100644 --- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb +++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.2.182.0.imx.bb @@ -27,9 +27,9 @@ EXTRA_OECMAKE = "\ -DBUILD_TESTS=OFF \ -DBUILD_WERROR=OFF \ -DUSE_ROBIN_HOOD_HASHING=OFF \ - -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \ - -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_DATADIR} \ - -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_DATADIR} \ + -DGLSLANG_INSTALL_DIR=${STAGING_DATADIR} \ + -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \ " 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" -- cgit v1.2.3-54-g00ecf