diff mbox series

[meta-oe] rapidjson: Upgrade to tip of trunk

Message ID 20250821185325.3763404-1-raj.khem@gmail.com
State New
Headers show
Series [meta-oe] rapidjson: Upgrade to tip of trunk | expand

Commit Message

Khem Raj Aug. 21, 2025, 6:53 p.m. UTC 
Fixes its cmake files to work with cmake4
consumed by other cmake based packages

Drop backport for CMake4 compatibility

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../0001-allow-build-with-cmake-4.patch       | 40 -------------------
 .../rapidjson/rapidjson_git.bb                |  6 +--
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch
deleted file mode 100644
index e40b9fe06c..0000000000
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson/0001-allow-build-with-cmake-4.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
-From b855b1632f9afe5199e01d84da54068a4cb152a8 Mon Sep 17 00:00:00 2001
-From: Alper Ak <alperyasinak1@gmail.com>
-Date: Tue, 8 Jul 2025 18:46:59 +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 <min> value.  Or, use the <min>...<max> syntax
-|   to tell CMake that the project requires at least <min> but has been updated
-|   to work with policies introduced by <max> or earlier.
-|
-|   Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Backport [https://github.com/Tencent/rapidjson/commit/ebd87cb468fb4cb060b37e579718c4a4125416c1]
-
-Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b9ac512..6d4121e9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
- if(POLICY CMP0025)
-   # detect Apple's Clang
-   cmake_policy(SET CMP0025 NEW)
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
index 92858044c1..fa20b4d448 100644
--- a/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
+++ b/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb
@@ -4,10 +4,8 @@  SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://license.txt;md5=ba04aa8f65de1396a7e59d1d746c2125"
 
-SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https \
-        file://0001-allow-build-with-cmake-4.patch"
-
-SRCREV = "0ccdbf364c577803e2a751f5aededce935314313"
+SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https"
+SRCREV = "24b5e7a8b27f42fa16b96fc70aade9106cf7102f"
 
 PV = "1.1.0+git"