summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-03-07 21:01:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-07 22:44:55 +0000
commit2c9d9bc3424e39fd50e9a35945f83615596abcc2 (patch)
treea6565ca80c93dcb2f866e6451242b2b08c1693cf /meta/recipes-devtools
parentd1394e77075d5f8215fd075ef6643228d02e496c (diff)
downloadpoky-2c9d9bc3424e39fd50e9a35945f83615596abcc2.tar.gz
cmake: upgrade 3.22.2 -> 3.22.3
refresh 0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch Changelog: ========== * The :command:'while' command again ignores errors in condition evaluation as CMake 3.21 and below did. This bug was fixed in 3.22.0, but exposed errors in existing projects. The fix has been reverted to restore compatibility. The fix may be restored in a future version of CMake via a policy. (From OE-Core rev: 146ceceaf81639085a82fd94d30ea84150a75e3a) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.22.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.22.2.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch6
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.22.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.22.2.bb)0
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb
index 8293fe5e56..8293fe5e56 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.22.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.22.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index a8bd4311c4..d500321138 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
21 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ 21 file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
22" 22"
23 23
24SRC_URI[sha256sum] = "3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced" 24SRC_URI[sha256sum] = "9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0"
25 25
26UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 26UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
27 27
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
index 9609f5f7c2..9a2287f517 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
@@ -1,4 +1,4 @@
1From e75f76b00cc9c1cfc231c5e731e975552f5dd13e Mon Sep 17 00:00:00 2001 1From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 27 Apr 2017 11:35:05 -0400 3Date: Thu, 27 Apr 2017 11:35:05 -0400
4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default 4Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
@@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
25 1 file changed, 7 insertions(+) 25 1 file changed, 7 insertions(+)
26 26
27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake 27diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
28index bae270de..5bb6bc0d 100644 28index 8c7af067..ade2b189 100644
29--- a/Modules/CMakeDetermineSystem.cmake 29--- a/Modules/CMakeDetermineSystem.cmake
30+++ b/Modules/CMakeDetermineSystem.cmake 30+++ b/Modules/CMakeDetermineSystem.cmake
31@@ -111,6 +111,13 @@ else() 31@@ -112,6 +112,13 @@ else()
32 endif() 32 endif()
33 endif() 33 endif()
34 34
diff --git a/meta/recipes-devtools/cmake/cmake_3.22.2.bb b/meta/recipes-devtools/cmake/cmake_3.22.3.bb
index 36c6357dd8..36c6357dd8 100644
--- a/meta/recipes-devtools/cmake/cmake_3.22.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.22.3.bb