mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 05:30:02 +00:00
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>
This commit is contained in:
@@ -1,29 +0,0 @@
|
|||||||
From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com>
|
|
||||||
Date: Thu, 28 Apr 2022 17:36:54 +0200
|
|
||||||
Subject: [PATCH] Fix overwriting linker flags
|
|
||||||
|
|
||||||
Upstream-Status: Backport
|
|
||||||
[https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687]
|
|
||||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
|
||||||
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 39b9ad365f78..ed33e3c47f70 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS)
|
|
||||||
)
|
|
||||||
list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
|
|
||||||
if (VSCRIPT_WORKS)
|
|
||||||
- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
|
|
||||||
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
-1
@@ -10,7 +10,6 @@ This makes symbols in the same visibility as built with libtool.
|
|||||||
Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
|
Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
|
||||||
Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
|
Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
|
||||||
---
|
---
|
||||||
|
|
||||||
CMakeLists.txt | 3 +++
|
CMakeLists.txt | 3 +++
|
||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
|||||||
-51
@@ -1,51 +0,0 @@
|
|||||||
From 521d37abc0ed1178a39298d06d80d8d0e2a43e28 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chen Qi <Qi.Chen@windriver.com>
|
|
||||||
Date: Tue, 10 Sep 2024 00:48:00 -0700
|
|
||||||
Subject: [PATCH] add back JSON_INTEGER_IS_LONG_LONG for cmake
|
|
||||||
|
|
||||||
For autotools, JSON_INTEGER_IS_LONG_LONG is defined, but for
|
|
||||||
cmake, it's not. This means such macro, which is also documented,
|
|
||||||
is not consistent across different build systems. This is not
|
|
||||||
good, so add it for cmake.
|
|
||||||
|
|
||||||
This patch refers 8b975abca1055d40637c90b1dc4585af1d7df76c and is
|
|
||||||
part of it. So the upstream-status is marked as 'oe specific'.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [OE Specific]
|
|
||||||
|
|
||||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
|
||||||
---
|
|
||||||
CMakeLists.txt | 1 +
|
|
||||||
cmake/jansson_config.h.cmake | 4 +---
|
|
||||||
2 files changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 39b9ad3..0e95a94 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -193,6 +193,7 @@ endif ()
|
|
||||||
# detect what to use for the 64 bit type.
|
|
||||||
# Note: I will prefer long long if I can get it, as that is what the automake system aimed for.
|
|
||||||
if (NOT DEFINED JSON_INT_T)
|
|
||||||
+ set (JSON_INTEGER_IS_LONG_LONG 1)
|
|
||||||
if (HAVE_LONG_LONG_INT AND (LONG_LONG_INT EQUAL 8))
|
|
||||||
set (JSON_INT_T "long long")
|
|
||||||
elseif (HAVE_INT64_T)
|
|
||||||
diff --git a/cmake/jansson_config.h.cmake b/cmake/jansson_config.h.cmake
|
|
||||||
index 2f248cb..bec64da 100644
|
|
||||||
--- a/cmake/jansson_config.h.cmake
|
|
||||||
+++ b/cmake/jansson_config.h.cmake
|
|
||||||
@@ -21,9 +21,7 @@
|
|
||||||
#define JANSSON_USING_CMAKE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
|
|
||||||
- * as we will also check for __int64 etc types.
|
|
||||||
- * (the definition was used in the automake system) */
|
|
||||||
+#cmakedefine JSON_INTEGER_IS_LONG_LONG 1
|
|
||||||
|
|
||||||
/* Bring in the cmake-detected defines */
|
|
||||||
#cmakedefine HAVE_STDINT_H 1
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
||||||
+2
-4
@@ -2,15 +2,13 @@ SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON d
|
|||||||
HOMEPAGE = "http://www.digip.org/jansson/"
|
HOMEPAGE = "http://www.digip.org/jansson/"
|
||||||
BUGTRACKER = "https://github.com/akheron/jansson/issues"
|
BUGTRACKER = "https://github.com/akheron/jansson/issues"
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537"
|
||||||
|
|
||||||
SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
|
SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
|
||||||
file://0001-Fix-overwriting-linker-flags.patch \
|
|
||||||
file://0001-Honour-multilib-paths.patch \
|
file://0001-Honour-multilib-paths.patch \
|
||||||
file://0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch \
|
|
||||||
file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
|
file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9"
|
SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
|
UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||||
Reference in New Issue
Block a user