diff options
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers/0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch | 28 | ||||
-rw-r--r-- | meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.250.0.bb (renamed from meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.243.0.bb) | 6 |
2 files changed, 32 insertions, 2 deletions
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 0000000000..4db686fe2f --- /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 @@ | |||
1 | From ea7b9e6fc0b3f45d6032ce624bed85bbde5ec0bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 21 Jun 2023 20:03:03 +0200 | ||
4 | Subject: [PATCH] scripts/CMakeLists.txt: append to CMAKE_FIND_ROOT_PATH | ||
5 | instead of replacing it | ||
6 | |||
7 | Resetting CMAKE_FIND_ROOT_PATH in particular breaks builds in Yocto | ||
8 | (which is a major cross compiling framework). | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/KhronosGroup/Vulkan-ValidationLayers/commit/e1b11dc7856765cf45a283ac805ea5066c81cd9b] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | scripts/CMakeLists.txt | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt | ||
17 | index 94c8528c8..cd86c54eb 100644 | ||
18 | --- a/scripts/CMakeLists.txt | ||
19 | +++ b/scripts/CMakeLists.txt | ||
20 | @@ -124,7 +124,7 @@ if (MIMALLOC_INSTALL_DIR) | ||
21 | endif() | ||
22 | |||
23 | if (CMAKE_CROSSCOMPILING) | ||
24 | - set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) | ||
25 | + set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${CMAKE_PREFIX_PATH} PARENT_SCOPE) | ||
26 | else() | ||
27 | set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE) | ||
28 | 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 index bfb4b370b8..62c6343c45 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" | |||
8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c" |
10 | 10 | ||
11 | SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.243;protocol=https" | 11 | SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.250;protocol=https \ |
12 | SRCREV = "4ac0fd8e6cb3d49105d707d9ec07f0f3aa0943d6" | 12 | file://0001-scripts-CMakeLists.txt-append-to-CMAKE_FIND_ROOT_PAT.patch \ |
13 | " | ||
14 | SRCREV = "1541e00a63cd125f15d231d5a8059ebe66503b25" | ||
13 | 15 | ||
14 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
15 | 17 | ||