summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Gamblin <tgamblin@baylibre.com>2024-07-31 12:47:53 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-03 07:47:36 +0100
commit35efa5d55f5fe80b88d51a5bbc940a166c106653 (patch)
tree46b336bbb1e6edd67aeb7292d8b7d07b93433202
parent73f5bd99d243495a11111d8a436779788a8f59ff (diff)
downloadpoky-35efa5d55f5fe80b88d51a5bbc940a166c106653.tar.gz
cmake: upgrade 3.29.3 -> 3.30.1
Refresh 0001-CMakeLists.txt-disable-USE_NGHTTP2.patch to apply on top of the new version. Changelogs: 3.29.4+: https://cmake.org/cmake/help/latest/release/3.29.html#id2 3.30.x: https://cmake.org/cmake/help/latest/release/3.30.html (From OE-Core rev: 3bc8f132f2547105a4e631d909347b6e80e1f6d0) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_3.30.1.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.29.3.bb)0
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc2
-rw-r--r--meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch19
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.30.1.bb (renamed from meta/recipes-devtools/cmake/cmake_3.29.3.bb)0
4 files changed, 14 insertions, 7 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb b/meta/recipes-devtools/cmake/cmake-native_3.30.1.bb
index ddc41f289e..ddc41f289e 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.29.3.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.30.1.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 1155c1bbe0..604a22a2f0 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ 19SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20" 20"
21 21
22SRC_URI[sha256sum] = "252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" 22SRC_URI[sha256sum] = "df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1"
23 23
24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 24UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
25 25
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 b7ec3e7bac..090f441f0f 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 946011cbfd686fe6bd2cec94494f6b0c4394bb6c Mon Sep 17 00:00:00 2001 1From a2cd906c36a04c8ce5a0095ae53892902b30d728 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
@@ -13,20 +13,27 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
13Adjust the patch to apply on top of v3.28.3. 13Adjust the patch to apply on top of v3.28.3.
14 14
15Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> 15Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
16
17Adjust the patch to apply on top of v3.30.1.
18
19Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
16--- 20---
17 Utilities/cmcurl/CMakeLists.txt | 2 +- 21 Utilities/cmcurl/CMakeLists.txt | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
19 23
20diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt 24diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
21index 3dd24f1e..4a0f6773 100644 25index b766aee425..34ae7d2a39 100644
22--- a/Utilities/cmcurl/CMakeLists.txt 26--- a/Utilities/cmcurl/CMakeLists.txt
23+++ b/Utilities/cmcurl/CMakeLists.txt 27+++ b/Utilities/cmcurl/CMakeLists.txt
24@@ -91,7 +91,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only") 28@@ -94,7 +94,7 @@ set(USE_ECH OFF)
25 set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") 29 set(USE_HTTPSRR OFF)
26 set(SHARE_LIB_OBJECT OFF)
27 set(USE_LIBIDN2 ON) 30 set(USE_LIBIDN2 ON)
31 set(USE_LIBRTMP OFF)
28-set(USE_NGHTTP2 ON) 32-set(USE_NGHTTP2 ON)
29+set(USE_NGHTTP2 OFF) 33+set(USE_NGHTTP2 OFF)
30 set(USE_NGTCP2 OFF) 34 set(USE_NGTCP2 OFF)
35 set(USE_OPENSSL_QUIC OFF)
31 set(USE_QUICHE OFF) 36 set(USE_QUICHE OFF)
32 set(USE_WIN32_IDN OFF) 37--
382.39.2
39
diff --git a/meta/recipes-devtools/cmake/cmake_3.29.3.bb b/meta/recipes-devtools/cmake/cmake_3.30.1.bb
index 9146fa8c0f..9146fa8c0f 100644
--- a/meta/recipes-devtools/cmake/cmake_3.29.3.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.30.1.bb