diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2023-08-26 18:14:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-30 09:56:13 +0100 |
commit | 81f66af2612d54c544013fc2584e63c94bfaf96d (patch) | |
tree | 09175952598ec1a32d72797c3217449e08d93fce | |
parent | 173a772145acfc2749cf9caeda9b66b9d6c5fb11 (diff) | |
download | poky-81f66af2612d54c544013fc2584e63c94bfaf96d.tar.gz |
cmake: upgrade to v3.27.4
Changes:
Update cmcurl license checksum: change in copyright year.
Update sha256sum for new version.
Use cmake provided cppdap.
Disable debugger.
(From OE-Core rev: 6724382f2a063cfc0a9a79fcbd84b0dc9d2eb45a)
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.27.4.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.26.4.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.27.4.bb (renamed from meta/recipes-devtools/cmake/cmake_3.26.4.bb) | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb b/meta/recipes-devtools/cmake/cmake-native_3.27.4.bb index 26a3331cb0..546d117156 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.26.4.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.27.4.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM:append = " \ | |||
16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ | 16 | file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \ |
17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ | 17 | file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ |
18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ | 18 | file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ |
19 | file://Utilities/cmcurl/COPYING;md5=190c514872597083303371684954f238 \ | 19 | file://Utilities/cmcurl/COPYING;md5=db8448a1e43eb2125f7740fc397db1f6 \ |
20 | " | 20 | " |
21 | 21 | ||
22 | B = "${WORKDIR}/build" | 22 | B = "${WORKDIR}/build" |
@@ -27,6 +27,7 @@ CMAKE_EXTRACONF = "\ | |||
27 | -DBUILD_CursesDialog=1 \ | 27 | -DBUILD_CursesDialog=1 \ |
28 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | 28 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ |
29 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ | 29 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ |
30 | -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \ | ||
30 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ | 31 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ |
31 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ | 32 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ |
32 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ | 33 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ |
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index f57a77c7bb..430f13f4e1 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])}" | |||
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] = "313b6880c291bd4fe31c0aa51d6e62659282a521e695f30d5cc0d25abbd5c208" | 22 | SRC_URI[sha256sum] = "0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af" |
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.26.4.bb b/meta/recipes-devtools/cmake/cmake_3.27.4.bb index ae29a3a945..6a9a3266df 100644 --- a/meta/recipes-devtools/cmake/cmake_3.26.4.bb +++ b/meta/recipes-devtools/cmake/cmake_3.27.4.bb | |||
@@ -37,11 +37,13 @@ EXTRA_OECMAKE=" \ | |||
37 | -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ | 37 | -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ |
38 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | 38 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ |
39 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ | 39 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ |
40 | -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \ | ||
40 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ | 41 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \ |
41 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ | 42 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 \ |
42 | -DKWSYS_CHAR_IS_SIGNED=1 \ | 43 | -DKWSYS_CHAR_IS_SIGNED=1 \ |
43 | -DBUILD_CursesDialog=0 \ | 44 | -DBUILD_CursesDialog=0 \ |
44 | -DKWSYS_LFS_WORKS=1 \ | 45 | -DKWSYS_LFS_WORKS=1 \ |
46 | -DCMake_ENABLE_DEBUGGER=0 \ | ||
45 | " | 47 | " |
46 | 48 | ||
47 | do_install:append:class-nativesdk() { | 49 | do_install:append:class-nativesdk() { |