summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-01 10:34:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-03 10:51:27 +0000
commit76cbb330d1d257417f5153b91374aa63ab16aaa7 (patch)
treeaa63b47f99d1b7ba90cf1d1dfce1477a0a3b23c8
parent0ebc2cb04eeeb2a41de5930a8ab8b357ee5b124c (diff)
downloadpoky-76cbb330d1d257417f5153b91374aa63ab16aaa7.tar.gz
cmake-native,cmake: upgrade 3.31.0 -> 3.31.3,3.31.0 -> 3.31.3
(From OE-Core rev: 0d73ac24ae8ce2318e95db0203df4bfdaba60ae5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.31.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.31.0.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch4
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.31.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.31.0.bb)0
6 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.31.0.bb b/meta/recipes-devtools/cmake/cmake-native_3.31.3.bb
index e285a17681..e285a17681 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.31.0.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.31.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index d32e2084ef..14cd9ffc5e 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -20,7 +20,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20 file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ 20 file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "300b71db6d69dcc1ab7c5aae61cbc1aa2778a3e00cbd918bc720203e311468c3" 23SRC_URI[sha256sum] = "fac45bc6d410b49b3113ab866074888d6c9e9dc81a141874446eb239ac38cb87"
24 24
25UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 25UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
26 26
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch
index 57d5f08149..68c1020a42 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch
@@ -1,4 +1,4 @@
1From 29046e1308bec72cc21b0b00e979906f5a1fb63f Mon Sep 17 00:00:00 2001 1From d6e3cb98ffa81c6234ad5a563354ef5f442e1bb3 Mon Sep 17 00:00:00 2001
2From: Philip Lorenz <philip.lorenz@bmw.de> 2From: Philip Lorenz <philip.lorenz@bmw.de>
3Date: Mon, 3 Jun 2024 13:19:24 +0200 3Date: Mon, 3 Jun 2024 13:19:24 +0200
4Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags 4Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch
index 87efbd993d..fe3bf33c60 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch
@@ -1,4 +1,4 @@
1From 80655318696091d27d131e8c4a48140e37e73366 Mon Sep 17 00:00:00 2001 1From 3f9b36a52f12e8f8860cf4337acc9a9514a2095b Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 28 Dec 2022 17:51:27 +0800 3Date: Wed, 28 Dec 2022 17:51:27 +0800
4Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 4Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2
diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
index 9071d0f559..ea4c76f99f 100644
--- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
+++ b/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch
@@ -1,4 +1,4 @@
1From 2b8f6d4a5fddb5212ce07f0c61f5a3edbf5187d4 Mon Sep 17 00:00:00 2001 1From 7a4c1ed7b4dd038ef99c4a82e1d27743b2801757 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br> 2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Thu, 5 Jul 2018 10:28:04 -0300 3Date: Thu, 5 Jul 2018 10:28:04 -0300
4Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal 4Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal
@@ -18,7 +18,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
18 1 file changed, 2 insertions(+), 6 deletions(-) 18 1 file changed, 2 insertions(+), 6 deletions(-)
19 19
20diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt 20diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
21index feeaa3b7..c301fb25 100644 21index 4e4b49c1..50e9a733 100644
22--- a/Utilities/cmlibarchive/CMakeLists.txt 22--- a/Utilities/cmlibarchive/CMakeLists.txt
23+++ b/Utilities/cmlibarchive/CMakeLists.txt 23+++ b/Utilities/cmlibarchive/CMakeLists.txt
24@@ -745,12 +745,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) 24@@ -745,12 +745,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H)
diff --git a/meta/recipes-devtools/cmake/cmake_3.31.0.bb b/meta/recipes-devtools/cmake/cmake_3.31.3.bb
index 9146fa8c0f..9146fa8c0f 100644
--- a/meta/recipes-devtools/cmake/cmake_3.31.0.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.31.3.bb