diff options
| author |   wangmy <wangmy@fujitsu.com> | 2022-03-07 21:01:22 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-07 22:43:48 +0000 |
| commit | 146ceceaf81639085a82fd94d30ea84150a75e3a (patch) | |
| tree | d2a9aab54238e3fcd126d77224a9e43f61ff7d5d /meta/recipes-devtools/cmake | |
| parent | ae25cd186c3e0771ef9a3fe10fe7a75c8bde2f66 (diff) | |
| download | openembedded-core-contrib-146ceceaf81639085a82fd94d30ea84150a75e3a.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.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake')
| -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.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 6 | ||||
| -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 \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced" +SRC_URI[sha256sum] = "9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 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 @@ -From e75f76b00cc9c1cfc231c5e731e975552f5dd13e Mon Sep 17 00:00:00 2001 +From 89f6c846f02ad6d30b9ebb7eaaaa4fb6f9cec054 Mon Sep 17 00:00:00 2001 From: Cody P Schafer <dev@codyps.com> Date: Thu, 27 Apr 2017 11:35:05 -0400 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default @@ -25,10 +25,10 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 1 file changed, 7 insertions(+) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index bae270de..5bb6bc0d 100644 +index 8c7af067..ade2b189 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake -@@ -111,6 +111,13 @@ else() +@@ -112,6 +112,13 @@ else() endif() endif() 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 |