diff options
| author | Andrej Kozemcak <andrej.kozemcak@siemens.com> | 2026-03-09 11:06:20 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-17 13:25:19 -0700 |
| commit | 50ac24430d4f677e2d51943fd1b3e4a0788abf92 (patch) | |
| tree | 103c70803ebd6efdcb4a06b7e4c0f04a7999addc | |
| parent | 2979300f9946aab5cd66ca1b1171453de0efc2a3 (diff) | |
| download | meta-openembedded-50ac24430d4f677e2d51943fd1b3e4a0788abf92.tar.gz | |
jansson: upgrade 2.14.1 -> 2.15.0
Removed patch included in this release
Changelog: https://github.com/akheron/jansson/releases/tag/v2.15.0
Features:
- Add support for realloc by adding json_set_alloc_funcs2, json_get_alloc_funcs2
Fixes:
- Optimize serializatio
- Fix docstrings in hashtable.h
Build:
- Use target-based cmake settings
Signed-off-by: Andrej Kozemcak <andrej.kozemcak@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/jansson/jansson_2.15.0.bb (renamed from meta-oe/recipes-extended/jansson/jansson_2.14.1.bb) | 3 |
2 files changed, 1 insertions, 40 deletions
diff --git a/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch b/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch deleted file mode 100644 index 5264f26f81..0000000000 --- a/meta-oe/recipes-extended/jansson/jansson/0002-allow-build-with-cmake-4.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 5d7b2ced666b4fbccd0da6e06d504ae2960575c8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alper Ak <alperyasinak1@gmail.com> | ||
| 3 | Date: Tue, 8 Jul 2025 14:54:08 +0300 | ||
| 4 | Subject: [PATCH] cmake: Set minimum required version to 3.5 for CMake 4+ | ||
| 5 | compatibility | ||
| 6 | |||
| 7 | | CMake Error at CMakeLists.txt:1 (cmake_minimum_required): | ||
| 8 | | Compatibility with CMake < 3.5 has been removed from CMake. | ||
| 9 | | | ||
| 10 | | Update the VERSION argument <min> value. Or, use the <min>...<max> syntax | ||
| 11 | | to tell CMake that the project requires at least <min> but has been updated | ||
| 12 | | to work with policies introduced by <max> or earlier. | ||
| 13 | | | ||
| 14 | | Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. | ||
| 15 | | | ||
| 16 | | | ||
| 17 | | -- Configuring incomplete, errors occurred! | ||
| 18 | |||
| 19 | Upstream-Status: Backport [https://github.com/akheron/jansson/commit/96d160df90016066d04d493d1d69639474ba4f20] | ||
| 20 | |||
| 21 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 22 | --- | ||
| 23 | CMakeLists.txt | 2 +- | ||
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 25 | |||
| 26 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 27 | index 72f9762..d07412e 100644 | ||
| 28 | --- a/CMakeLists.txt | ||
| 29 | +++ b/CMakeLists.txt | ||
| 30 | @@ -1,4 +1,4 @@ | ||
| 31 | -cmake_minimum_required (VERSION 3.1) | ||
| 32 | +cmake_minimum_required (VERSION 3.5) | ||
| 33 | project(jansson C) | ||
| 34 | |||
| 35 | # Options | ||
| 36 | -- | ||
| 37 | 2.43.0 | ||
| 38 | |||
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb b/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb index e0916759c6..829ac1ad49 100644 --- a/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb +++ b/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb | |||
| @@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537" | |||
| 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ | 7 | SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ |
| 8 | file://0001-Honour-multilib-paths.patch \ | 8 | file://0001-Honour-multilib-paths.patch \ |
| 9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ | 9 | file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ |
| 10 | file://0002-allow-build-with-cmake-4.patch \ | ||
| 11 | " | 10 | " |
| 12 | SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce" | 11 | SRC_URI[sha256sum] = "a7eac7765000373165f9373eb748be039c10b2efc00be9af3467ec92357d8954" |
| 13 | 12 | ||
| 14 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" | 13 | UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" |
| 15 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" | 14 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" |
