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
@@ -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 \
@@ -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"
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
@@ -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
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 Signed-off-by: Prasanth R <prasanth.r@lineo.co.jp> --- 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%)