Skip to contentSkip to conversation

cmake,cmake-native: upgrade 4.4.5 -> 4.5.0

PATCH Superseded Prasanth R 2 participants 3 messages Nov 17 – Nov 18

lore
Share & tools
lore

Prasanth R

author
#0 lore raw

PATCH 1/1 cmake,cmake-native: upgrade 4.4.5 -> 4.5.0

CMake 4.5 now bundles rapidhash (MIT), so add its license file.

Release notes:
https://cmake.org/cmake/help/v4.5/release/4.5.html

AI-Generated: Uses Claude

---
AUH reported a do_compile failure, but it builds here:
cmake-native, nativesdk-cmake, and cmake for qemux86-64 and qemuarm. Rebuilt and tested expat, json-c, libjpeg-turbo, fmt, libzip, libcheck, nghttp2, taglib, opkg and libubootenv with it.

 .../cmake/{cmake-native_4.4.5.bb => cmake-native_4.5.0.bb}      | 1 +
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 meta/recipes-devtools/cmake/{cmake_4.4.5.bb => cmake_4.5.0.bb}  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/cmake/{cmake-native_4.4.5.bb => cmake-native_4.5.0.bb} (97%)
 rename meta/recipes-devtools/cmake/{cmake_4.4.5.bb => cmake_4.5.0.bb} (96%)
meta/recipes-devtools/cmake/cmake-native_4.5.0.bb renamed from meta/recipes-devtools/cmake/cmake-native_4.4.5.bb +1 -0
similarity index 97%
rename from meta/recipes-devtools/cmake/cmake-native_4.4.5.bb
rename to meta/recipes-devtools/cmake/cmake-native_4.5.0.bb
index aed38b7ed1..5f52489cbf 100644
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmcurl/COPYING;md5=0515352b285b9c3f66464b135c9c0fdc \
     file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
     file://Utilities/cmcppdap/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://Utilities/cmrapidhash/LICENSE;md5=4ba32c08f2e0fce0078296c3d100fb93 \
 "
 
 B = "${WORKDIR}/build"
meta/recipes-devtools/cmake/cmake.inc +1 -1
index 30294fd9b8..01fe71c119 100644
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "a0c54c88abb8078dd8eccadb717fc6bb194bf18e7d44c86309910288886e04e2"
+SRC_URI[sha256sum] = "424352d6133e8455e020da787008e8dc67abb18820af3532572ab35657e49213"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake_4.5.0.bb renamed from meta/recipes-devtools/cmake/cmake_4.4.5.bb +1 -0
similarity index 96%
rename from meta/recipes-devtools/cmake/cmake_4.4.5.bb
rename to meta/recipes-devtools/cmake/cmake_4.5.0.bb
index 6265316fd9..9cfd4434f0 100644
@@ -15,6 +15,7 @@ LICENSE:append = " AND BSD-1-Clause AND MIT"
 LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
     file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
+    file://Utilities/cmrapidhash/LICENSE;md5=4ba32c08f2e0fce0078296c3d100fb93 \
 "
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · prasanth via openembedded-core

CMake 4.5 now bundles rapidhash (MIT), so add its license file.

Release notes:
https://cmake.org/cmake/help/v4.5/release/4.5.html

AI-Generated: Uses Claude

Hi Prasanth,

Thanks for the update.

It looks like this is failing to build:

ERROR: cmake-native-4.5.0-r0 do_configure: Execution of '/srv/pokybuild/yocto-worker/genericarm64/build/build/tmp/work/x86_64-linux/cmake-native/4.5.0/temp/run.do_configure.575456' failed with exit code 11
...

| -- Looking for OPENSSL_IS_AWSLC
| -- Looking for OPENSSL_IS_AWSLC - not found
| -- Looking for OPENSSL_IS_BORINGSSL
| -- Looking for OPENSSL_IS_BORINGSSL - not found
| -- Looking for LIBRESSL_VERSION_NUMBER
| -- Looking for LIBRESSL_VERSION_NUMBER - not found
| -- Configuring incomplete, errors occurred!
| CMake Error at Utilities/cmcurl/CMakeLists.txt:1040 (message):
|   Found OpenSSL version 1.1.1k.  When building CMake with vendored curl, at
|   least version 3.0.0 is required, or configure CMake with
|   -DCMAKE_USE_OPENSSL=OFF to build without OpenSSL.
|

https://autobuilder.yoctoproject.org/valkyrie/#/builders/60/builds/5016

Can you have a look at the issue?

Thanks,
Mathieu

Signature · 3 lines
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH v2 1/1 cmake,cmake-native: upgrade 4.4.5 -> 4.5.0

In reply to Prasanth R

CMake 4.5 now bundles rapidhash (MIT), so add its license file.

The bundled curl in 4.5 refuses OpenSSL older than 3.0. cmake-native takes its libraries from the native sysroot (CMAKE_LIBRARY_PATH) but not its headers, so FindOpenSSL used the host's openssl/ssl.h and the build failed on hosts with OpenSSL 1.1. Add CMAKE_INCLUDE_PATH so the headers come from openssl-native as well.

Release notes:
https://cmake.org/cmake/help/v4.5/release/4.5.html

AI-Generated: Uses Claude

---
v2:
- Take headers from the native sysroot too (CMAKE_INCLUDE_PATH), so FindOpenSSL uses openssl-native instead of the host's OpenSSL 1.1.

Tested: cmake-native, nativesdk-cmake, and cmake for qemux86-64 and qemuarm; OPENSSL_INCLUDE_DIR now points to recipe-sysroot-native (it was /usr/include before).

 .../cmake/{cmake-native_4.4.5.bb => cmake-native_4.5.0.bb}      | 2 ++
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 meta/recipes-devtools/cmake/{cmake_4.4.5.bb => cmake_4.5.0.bb}  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/cmake/{cmake-native_4.4.5.bb => cmake-native_4.5.0.bb} (95%)
 rename meta/recipes-devtools/cmake/{cmake_4.4.5.bb => cmake_4.5.0.bb} (96%)
meta/recipes-devtools/cmake/cmake-native_4.5.0.bb renamed from meta/recipes-devtools/cmake/cmake-native_4.4.5.bb +2 -0
similarity index 95%
rename from meta/recipes-devtools/cmake/cmake-native_4.4.5.bb
rename to meta/recipes-devtools/cmake/cmake-native_4.5.0.bb
index aed38b7ed1..48362195ef 100644
@@ -17,6 +17,7 @@ LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmcurl/COPYING;md5=0515352b285b9c3f66464b135c9c0fdc \
     file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec \
     file://Utilities/cmcppdap/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://Utilities/cmrapidhash/LICENSE;md5=4ba32c08f2e0fce0078296c3d100fb93 \
 "
 
 B = "${WORKDIR}/build"
@@ -24,6 +25,7 @@ do_configure[cleandirs] = "${B}"
 
 EXTRA_OECMAKE += "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
+    -DCMAKE_INCLUDE_PATH=${STAGING_INCDIR_NATIVE} \
     -DBUILD_CursesDialog=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_CPPDAP=0 \
meta/recipes-devtools/cmake/cmake.inc +1 -1
index 30294fd9b8..01fe71c119 100644
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            "
 
-SRC_URI[sha256sum] = "a0c54c88abb8078dd8eccadb717fc6bb194bf18e7d44c86309910288886e04e2"
+SRC_URI[sha256sum] = "424352d6133e8455e020da787008e8dc67abb18820af3532572ab35657e49213"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/cmake/cmake_4.5.0.bb renamed from meta/recipes-devtools/cmake/cmake_4.4.5.bb +1 -0
similarity index 96%
rename from meta/recipes-devtools/cmake/cmake_4.4.5.bb
rename to meta/recipes-devtools/cmake/cmake_4.5.0.bb
index 6265316fd9..9cfd4434f0 100644
@@ -15,6 +15,7 @@ LICENSE:append = " AND BSD-1-Clause AND MIT"
 LIC_FILES_CHKSUM:append = " \
     file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 \
     file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
+    file://Utilities/cmrapidhash/LICENSE;md5=4ba32c08f2e0fce0078296c3d100fb93 \
 "
 
 # Strip ${prefix} from ${docdir}, set result into docdir_stripped
Signature · 1 line
2.34.1