Backport a patch to unbreak cross-builds. Signed-off-by: Alexander Kanavin <[email protected]> --- ...ts.txt-append-to-CMAKE_FIND_ROOT_PAT.patch | 28 +++++++++++++++++++ ... => vulkan-validation-layers_1.3.250.0.bb} | 6 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch rename meta/recipes-graphics/vulkan/{vulkan-validation-layers_1.3.243.0.bb => vulkan-validation-layers_1.3.250.0.bb} (90%)
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch new file mode 100644 index 00000000000..4db686fe2fe --- /dev/null +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch @@ -0,0 +1,28 @@ +From ea7b9e6fc0b3f45d6032ce624bed85bbde5ec0bf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 21 Jun 2023 20:03:03 +0200 +Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH + instead of replacing it + +Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto +(which is a major cross compiling framework). + +Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/e1b11dc7856765cf45a283ac805ea5066c81cd9b] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + scripts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 94c8528c8..cd86c54eb 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -124,7 +124,7 @@ if (MIMALLOC_INSTALL_DIR) + endif() + + if (CMAKE_CROSSCOMPILING) +- set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) ++ set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + else() + set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) + endif() 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.250.0.bb similarity index 90% rename from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb rename to meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb index bfb4b370b83..62c6343c45e 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb @@ -8,8 +8,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" -SRC_URI = "git://[email protected]/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.243;protocol=https" -SRCREV = "4ac0fd8e6cb3d49105d707d9ec07f0f3aa0943d6" +SRC_URI = "git://[email protected]/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.250;protocol=https \ + file://0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch \ + " +SRCREV = "1541e00a63cd125f15d231d5a8059ebe66503b25" S = "${WORKDIR}/git" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#183389): https://lists.openembedded.org/g/openembedded-core/message/183389 Mute This Topic: https://lists.openembedded.org/mt/99776696/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
