commit: 89e3d37442377fbb4ba75f81c887f9962c06b27e Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Wed Jun 11 11:05:28 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 9 21:04:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e3d374
net-libs/mbedtls: update cmake_minimum_required Update cmake_minimum_required in all CMakeLists.txt files. Closes: https://bugs.gentoo.org/957450 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42543 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../mbedtls/files/mbedtls-2.8.10-cmake-4.patch | 34 ++++++++++++++++++++++ net-libs/mbedtls/mbedtls-2.28.10.ebuild | 7 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/net-libs/mbedtls/files/mbedtls-2.8.10-cmake-4.patch b/net-libs/mbedtls/files/mbedtls-2.8.10-cmake-4.patch new file mode 100644 index 000000000000..6e79712ffabc --- /dev/null +++ b/net-libs/mbedtls/files/mbedtls-2.8.10-cmake-4.patch @@ -0,0 +1,34 @@ +From https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3 +From https://github.com/Mbed-TLS/mbedtls/commit/a722d0a415b47df512c6d4b3c0b58d612b9c9b95 +From: Dave Rodgman <[email protected]> +Date: Fri, 4 Jun 2021 17:04:20 +0100 +Subject: [PATCH] Update minimum CMake version in CMakeLists.txt + +Signed-off-by: Dave Rodgman <[email protected]> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,7 +16,9 @@ + # mbedtls, mbedx509, mbedcrypto and apidoc targets. + # + +-cmake_minimum_required(VERSION 2.8.12) ++# We specify a minimum requirement of 3.10.2, but for now use 3.5.1 here ++# until our infrastructure catches up. ++cmake_minimum_required(VERSION 3.10) + + # https://cmake.org/cmake/help/latest/policy/CMP0011.html + # Setting this policy is required in CMake >= 3.18.0, otherwise a warning is generated. The OLD +From a722d0a415b47df512c6d4b3c0b58d612b9c9b95 Mon Sep 17 00:00:00 2001 +From: Paul Elliott <[email protected]> +Date: Tue, 12 Sep 2023 16:27:24 +0100 +Subject: [PATCH] Update CMake minimum version(s) to match main CMakeLists.txt + +Signed-off-by: Paul Elliott <[email protected]> +--- a/programs/test/cmake_subproject/CMakeLists.txt ++++ b/programs/test/cmake_subproject/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10) + + # Test the target renaming support by adding a prefix to the targets built + set(MBEDTLS_TARGET_PREFIX subproject_test_) diff --git a/net-libs/mbedtls/mbedtls-2.28.10.ebuild b/net-libs/mbedtls/mbedtls-2.28.10.ebuild index bb44c16f864f..78382b0bb91e 100644 --- a/net-libs/mbedtls/mbedtls-2.28.10.ebuild +++ b/net-libs/mbedtls/mbedtls-2.28.10.ebuild @@ -30,6 +30,10 @@ BDEPEND=" test? ( dev-lang/perl ) " +PATCHES=( + "${FILESDIR}/mbedtls-2.8.10-cmake-4.patch" +) + enable_mbedtls_option() { local myopt="$@" # check that config.h syntax is the same at version bump @@ -46,7 +50,8 @@ src_prepare() { use threads && enable_mbedtls_option MBEDTLS_THREADING_C use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD - sed -i -e "s:VERSION 2.8.12:VERSION 3.10:g" CMakeLists.txt || die + #sed -i -e "s:\(cmake_minimum_required\).*:\1(VERSION 3.10):g" \ + # CMakeLists.txt programs/test/cmake_subproject/CMakeLists.txt || die cmake_src_prepare }
