diff options
author | Trevor Gamblin <tgamblin@baylibre.com> | 2024-02-06 12:20:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-08 17:12:54 +0000 |
commit | 0c3818be26434b706ddfbefaea9cf6c78b779261 (patch) | |
tree | e9d92a73c2c4d14693eea2fcd7881932bcc3485f /meta/recipes-devtools/cmake/cmake | |
parent | a380d6d13702293df17699851ec25d13ac28cbfc (diff) | |
download | poky-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/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch | 14 |
1 files changed, 9 insertions, 5 deletions
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 @@ | |||
1 | From 3fd6082c52a8140db5995afb59fb391f7d5c19d7 Mon Sep 17 00:00:00 2001 | 1 | From d33d8a5e9f3b25a80d47b72b1a8a6624a85563c1 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 | 3 | Date: Wed, 28 Dec 2022 17:51:27 +0800 |
4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 | 4 | Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 |
@@ -9,17 +9,21 @@ dependency, disable nghttp2. | |||
9 | Upstream-Status: Inappropriate [oe specific] | 9 | Upstream-Status: Inappropriate [oe specific] |
10 | 10 | ||
11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
12 | |||
13 | Adjust the patch to apply on top of v3.28.3. | ||
14 | |||
15 | Signed-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 | ||
16 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt | 20 | diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt |
17 | index f842270b..17b1ce19 100644 | 21 | index 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 | -- |
30 | 2.25.1 | 34 | 2.43.0 |
31 | 35 | ||