diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-05-03 19:51:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:26 +0100 |
commit | 9a62bd8d782e63155b1db4c5174b7e00b774a052 (patch) | |
tree | 70e3b7a59e01a0b9d2665d373ab27f08886341b7 /meta/recipes-devtools/cmake | |
parent | a47d7ba1af1de81365ce9519844f199217ccc653 (diff) | |
download | poky-9a62bd8d782e63155b1db4c5174b7e00b774a052.tar.gz |
cmake: Upgrade to 3.26.3
License-Update: Copyright year changed from 2022 -> 2023
- Copyright 2000-2022 Kitware, Inc. and Contributors
+ Copyright 2000-2023 Kitware, Inc. and Contributors
Call bootstrap directly without wrapping it with configure
since all it does it find the sourcedir
(From OE-Core rev: f038e40328eff37fe5d16310853448ba21e5c9f4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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.26.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.25.2.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.26.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.25.2.bb) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.25.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.26.3.bb index c150aef5ef..2177aa81a4 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.25.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.26.3.bb | |||
@@ -38,7 +38,7 @@ CMAKE_EXTRACONF = "\ | |||
38 | " | 38 | " |
39 | 39 | ||
40 | do_configure () { | 40 | do_configure () { |
41 | ${S}/configure --verbose --prefix=${prefix} \ | 41 | ${S}/bootstrap --verbose --prefix=${prefix} \ |
42 | ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ | 42 | ${@oe.utils.parallel_make_argument(d, '--parallel=%d')} \ |
43 | ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ | 43 | ${@bb.utils.contains('CCACHE', 'ccache ', '--enable-ccache', '', d)} \ |
44 | -- ${CMAKE_EXTRACONF} | 44 | -- ${CMAKE_EXTRACONF} |
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index b7e674c4c4..2b6554690b 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.cmake.org/" | |||
10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 10 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" |
11 | SECTION = "console/utils" | 11 | SECTION = "console/utils" |
12 | LICENSE = "BSD-3-Clause" | 12 | LICENSE = "BSD-3-Clause" |
13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=09069e0fffe4e5eaf6dde04c3b1932e5 \ | 13 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=9d3d12c5f3b4c1f83650adcc65b59c06 \ |
14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ | 14 | file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ |
15 | " | 15 | " |
16 | 16 | ||
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | |||
19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 19 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c" | 22 | SRC_URI[sha256sum] = "bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659" |
23 | 23 | ||
24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 24 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/cmake/cmake_3.25.2.bb b/meta/recipes-devtools/cmake/cmake_3.26.3.bb index bb7ed83e30..bb7ed83e30 100644 --- a/meta/recipes-devtools/cmake/cmake_3.25.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.26.3.bb | |||