summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-09-16 17:41:12 +0800
committerKhem Raj <raj.khem@gmail.com>2025-09-16 09:59:15 -0700
commit22b9cd61a06be2f75c38db4ccb200a620771fc8d (patch)
tree2432bcebd98e955d0b7e34eec2ef7c58b204d0f6
parenta849b20f90a668978891d01071f4c07e109726a7 (diff)
downloadmeta-openembedded-22b9cd61a06be2f75c38db4ccb200a620771fc8d.tar.gz
cjson: upgrade 1.7.18 -> 1.7.19
0001-allow-build-with-cmake-4.patch refreshed for 1.7.19 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch9
-rw-r--r--meta-oe/recipes-devtools/cjson/cjson_1.7.19.bb (renamed from meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb)2
2 files changed, 4 insertions, 7 deletions
diff --git a/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch b/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch
index 7bd608ca0a..05b19d257a 100644
--- a/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch
+++ b/meta-oe/recipes-devtools/cjson/cjson/0001-allow-build-with-cmake-4.patch
@@ -1,4 +1,4 @@
1From 8622490d650ba4d107561a0e8f3cf881fa0247c7 Mon Sep 17 00:00:00 2001 1From 13a050b263ab53c1dc8d05b12e65c21da7c054b3 Mon Sep 17 00:00:00 2001
2From: Alper Ak <alperyasinak1@gmail.com> 2From: Alper Ak <alperyasinak1@gmail.com>
3Date: Tue, 8 Jul 2025 15:09:11 +0300 3Date: Tue, 8 Jul 2025 15:09:11 +0300
4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ 4Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+
@@ -26,7 +26,7 @@ Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
26 1 file changed, 1 insertion(+), 1 deletion(-) 26 1 file changed, 1 insertion(+), 1 deletion(-)
27 27
28diff --git a/CMakeLists.txt b/CMakeLists.txt 28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index 36a6cb5..9428da5 100644 29index c7ca27f..59e4af5 100644
30--- a/CMakeLists.txt 30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt 31+++ b/CMakeLists.txt
32@@ -1,5 +1,5 @@ 32@@ -1,5 +1,5 @@
@@ -35,7 +35,4 @@ index 36a6cb5..9428da5 100644
35+cmake_minimum_required(VERSION 3.5) 35+cmake_minimum_required(VERSION 3.5)
36 36
37 project(cJSON 37 project(cJSON
38 VERSION 1.7.18 38 VERSION 1.7.19
39--
402.43.0
41
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.19.bb
index 7ece0065ba..d914018331 100644
--- a/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb
+++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.19.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \
8 file://run-ptest \ 8 file://run-ptest \
9 file://0001-allow-build-with-cmake-4.patch \ 9 file://0001-allow-build-with-cmake-4.patch \
10 " 10 "
11SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" 11SRCREV = "c859b25da02955fef659d658b8f324b5cde87be3"
12 12
13inherit cmake pkgconfig ptest 13inherit cmake pkgconfig ptest
14 14