From 36105067948c8752615add029da76498d6a5c26f Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Wed, 17 Dec 2025 16:34:49 +0800 Subject: [PATCH] double-conversion: upgrade 3.3.1 -> 3.4.0 Drop 0001-allow-build-with-cmake-4.patch as it was merged upstream. Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- ...on_3.3.1.bb => double-conversion_3.4.0.bb} | 5 +-- .../files/0001-allow-build-with-cmake-4.patch | 40 ------------------- 2 files changed, 2 insertions(+), 43 deletions(-) rename meta-oe/recipes-support/dc/{double-conversion_3.3.1.bb => double-conversion_3.4.0.bb} (90%) delete mode 100644 meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb b/meta-oe/recipes-support/dc/double-conversion_3.4.0.bb similarity index 90% rename from meta-oe/recipes-support/dc/double-conversion_3.3.1.bb rename to meta-oe/recipes-support/dc/double-conversion_3.4.0.bb index 42777971d8..be2d531d02 100644 --- a/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb +++ b/meta-oe/recipes-support/dc/double-conversion_3.4.0.bb @@ -6,11 +6,10 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" SRC_URI = " \ - git://github.com/google/double-conversion.git;protocol=https;branch=master \ + git://github.com/google/double-conversion.git;protocol=https;branch=master;tag=v${PV} \ file://run-ptest \ - file://0001-allow-build-with-cmake-4.patch \ " -SRCREV = "ae0dbfeb9744efd216c95b30555049d75d47116a" +SRCREV = "9dd6227ee3e29807183e56877f0282aeb40b8b1e" inherit cmake ptest diff --git a/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch deleted file mode 100644 index db8296c65d..0000000000 --- a/meta-oe/recipes-support/dc/files/0001-allow-build-with-cmake-4.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1652f5b555b4b4a7916af40bebacc32c23e4aca5 Mon Sep 17 00:00:00 2001 -From: Alper Ak -Date: Tue, 8 Jul 2025 20:43:45 +0300 -Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ - compatibility - -Fix: - -| CMake Error at CMakeLists.txt:1 (cmake_minimum_required): -| Compatibility with CMake < 3.5 has been removed from CMake. -| -| Update the VERSION argument value. Or, use the ... syntax -| to tell CMake that the project requires at least but has been updated -| to work with policies introduced by or earlier. -| -| Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. -| -| -| -- Configuring incomplete, errors occurred! - -Upstream-Status: Backport [https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906] - -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8749ef8..3145772 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - project(double-conversion VERSION 3.3.0) - - option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) --- -2.43.0 -