summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
diff options
context:
space:
mode:
authorTrevor Gamblin <tgamblin@baylibre.com>2024-02-06 12:20:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-08 17:12:54 +0000
commit0c3818be26434b706ddfbefaea9cf6c78b779261 (patch)
treee9d92a73c2c4d14693eea2fcd7881932bcc3485f /meta/recipes-devtools/cmake
parenta380d6d13702293df17699851ec25d13ac28cbfc (diff)
downloadpoky-0c3818be26434b706ddfbefaea9cf6c78b779261.tar.gz
cmake: upgrade 3.27.7 -> 3.28.3
Changelog: https://cmake.org/cmake/help/latest/release/3.28.html The patch 0001-CMakeLists.txt-disable-USE_NGHTTP2.patch had to be adjusted to apply cleanly on top of the new source version. (From OE-Core rev: 64b3832c5c96ee44ccc3da633a065eef33e3e03d) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.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.28.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.27.7.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.patch14
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.28.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.27.7.bb)0
4 files changed, 10 insertions, 6 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.27.7.bb b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb
index 546d117156..546d117156 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.27.7.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.28.3.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index ecb0e487df..ab9f459c05 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] = "08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e" 22SRC_URI[sha256sum] = "72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1"
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 d6486cb45f..b2933d88be 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 3fd6082c52a8140db5995afb59fb391f7d5c19d7 Mon Sep 17 00:00:00 2001 1From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 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
@@ -9,17 +9,21 @@ dependency, disable nghttp2.
9Upstream-Status: Inappropriate [oe specific] 9Upstream-Status: Inappropriate [oe specific]
10 10
11Signed-off-by: Changqing Li <changqing.li@windriver.com> 11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12
13Adjust the patch to apply on top of v3.28.3.
14
15Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
12--- 16---
13 Utilities/cmcurl/CMakeLists.txt | 2 +- 17 Utilities/cmcurl/CMakeLists.txt | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
15 19
16diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt 20diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
17index f842270b..17b1ce19 100644 21index 9387247366..d3de01f4e8 100644
18--- a/Utilities/cmcurl/CMakeLists.txt 22--- a/Utilities/cmcurl/CMakeLists.txt
19+++ b/Utilities/cmcurl/CMakeLists.txt 23+++ b/Utilities/cmcurl/CMakeLists.txt
20@@ -68,7 +68,7 @@ set(ENABLE_UNIX_SOCKETS OFF CACHE INTERNAL "No curl Unix domain sockets support" 24@@ -88,7 +88,7 @@ set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
21 set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
22 set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options") 25 set(PICKY_COMPILER OFF CACHE INTERNAL "Enable picky compiler options")
26 set(SHARE_LIB_OBJECT OFF)
23 set(USE_LIBIDN2 ON) 27 set(USE_LIBIDN2 ON)
24-set(USE_NGHTTP2 ON) 28-set(USE_NGHTTP2 ON)
25+set(USE_NGHTTP2 OFF) 29+set(USE_NGHTTP2 OFF)
@@ -27,5 +31,5 @@ index f842270b..17b1ce19 100644
27 set(USE_QUICHE OFF) 31 set(USE_QUICHE OFF)
28 set(USE_WIN32_IDN OFF) 32 set(USE_WIN32_IDN OFF)
29-- 33--
302.25.1 342.43.0
31 35
diff --git a/meta/recipes-devtools/cmake/cmake_3.27.7.bb b/meta/recipes-devtools/cmake/cmake_3.28.3.bb
index 6a9a3266df..6a9a3266df 100644
--- a/meta/recipes-devtools/cmake/cmake_3.27.7.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.28.3.bb