summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2025-03-30 17:28:00 +0800
committerKhem Raj <raj.khem@gmail.com>2025-03-31 14:42:07 -0700
commitd0edd4190f9771234dc27f1e222a51fd34bae2cb (patch)
treeb30d81adb59e962e4e2d974ca300bb7c3391c77f
parent2f3b740b4ffc3bd2aa45d94a20d27de8a3160991 (diff)
downloadmeta-openembedded-d0edd4190f9771234dc27f1e222a51fd34bae2cb.tar.gz
jansson: upgrade 2.14 -> 2.14.1
ChangeLog: https://github.com/akheron/jansson/releases/tag/v2.14.1 * Drop backport patches. License-Update: Updated copyright years Add an exception for `src/dtoa.c`[1] [1] https://github.com/akheron/jansson/commit/2297a2e320ebecc6dc98f7034a2f38509ad1d7f5 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch29
-rw-r--r--meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch1
-rw-r--r--meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch51
-rw-r--r--meta-oe/recipes-extended/jansson/jansson_2.14.1.bb (renamed from meta-oe/recipes-extended/jansson/jansson_2.14.bb)6
4 files changed, 2 insertions, 85 deletions
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
deleted file mode 100644
index 5eee6f85aa..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001
2From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com>
3Date: Thu, 28 Apr 2022 17:36:54 +0200
4Subject: [PATCH] Fix overwriting linker flags
5
6Upstream-Status: Backport
7[https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687]
8Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
9
10---
11 CMakeLists.txt | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 39b9ad365f78..ed33e3c47f70 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS)
19 )
20 list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
21 if (VSCRIPT_WORKS)
22- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
23+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
24 endif()
25 endif()
26
27--
282.35.1
29
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
index 30b30b8850..a1c17d1d8e 100644
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
+++ b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
@@ -10,7 +10,6 @@ This makes symbols in the same visibility as built with libtool.
10Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704] 10Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
11Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com> 11Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
12--- 12---
13
14 CMakeLists.txt | 3 +++ 13 CMakeLists.txt | 3 +++
15 1 file changed, 3 insertions(+) 14 1 file changed, 3 insertions(+)
16 15
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch b/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch
deleted file mode 100644
index 5298cfbefc..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 521d37abc0ed1178a39298d06d80d8d0e2a43e28 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 10 Sep 2024 00:48:00 -0700
4Subject: [PATCH] add back JSON_INTEGER_IS_LONG_LONG for cmake
5
6For autotools, JSON_INTEGER_IS_LONG_LONG is defined, but for
7cmake, it's not. This means such macro, which is also documented,
8is not consistent across different build systems. This is not
9good, so add it for cmake.
10
11This patch refers 8b975abca1055d40637c90b1dc4585af1d7df76c and is
12part of it. So the upstream-status is marked as 'oe specific'.
13
14Upstream-Status: Inappropriate [OE Specific]
15
16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17---
18 CMakeLists.txt | 1 +
19 cmake/jansson_config.h.cmake | 4 +---
20 2 files changed, 2 insertions(+), 3 deletions(-)
21
22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index 39b9ad3..0e95a94 100644
24--- a/CMakeLists.txt
25+++ b/CMakeLists.txt
26@@ -193,6 +193,7 @@ endif ()
27 # detect what to use for the 64 bit type.
28 # Note: I will prefer long long if I can get it, as that is what the automake system aimed for.
29 if (NOT DEFINED JSON_INT_T)
30+ set (JSON_INTEGER_IS_LONG_LONG 1)
31 if (HAVE_LONG_LONG_INT AND (LONG_LONG_INT EQUAL 8))
32 set (JSON_INT_T "long long")
33 elseif (HAVE_INT64_T)
34diff --git a/cmake/jansson_config.h.cmake b/cmake/jansson_config.h.cmake
35index 2f248cb..bec64da 100644
36--- a/cmake/jansson_config.h.cmake
37+++ b/cmake/jansson_config.h.cmake
38@@ -21,9 +21,7 @@
39 #define JANSSON_USING_CMAKE
40 #endif
41
42-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
43- * as we will also check for __int64 etc types.
44- * (the definition was used in the automake system) */
45+#cmakedefine JSON_INTEGER_IS_LONG_LONG 1
46
47 /* Bring in the cmake-detected defines */
48 #cmakedefine HAVE_STDINT_H 1
49--
502.42.0
51
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
index 4ac30c4dba..715b1af5c5 100644
--- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb
+++ b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
@@ -2,15 +2,13 @@ SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON d
2HOMEPAGE = "http://www.digip.org/jansson/" 2HOMEPAGE = "http://www.digip.org/jansson/"
3BUGTRACKER = "https://github.com/akheron/jansson/issues" 3BUGTRACKER = "https://github.com/akheron/jansson/issues"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537"
6 6
7SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ 7SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
8 file://0001-Fix-overwriting-linker-flags.patch \
9 file://0001-Honour-multilib-paths.patch \ 8 file://0001-Honour-multilib-paths.patch \
10 file://0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch \
11 file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \ 9 file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
12 " 10 "
13SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" 11SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce"
14 12
15UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" 13UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
16UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" 14UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"