mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

jansson: move to oe-core

Browse Source 
Added in oe-core commit:
https://git.openembedded.org/openembedded-core/commit/?id=2b6e7d092b4a21930186682ebf085848b2e49de5

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Alexander Kanavin
2026-06-21 14:12:13 +02:00
committed by Khem Raj
parent 307939aa9d
commit 3f6993c661
4 changed files with 0 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
-1
View File
@@ -348,7 +348,6 @@ RDEPENDS:packagegroup-meta-oe-extended = "\
indent \
iotop \
isomd5sum \
jansson \
jpnevulator \
libblockdev \
libcec \
meta-oe/recipes-extended/jansson/jansson/0001-Honour-multilib-paths.patch
-63
View File
@@ -1,63 +0,0 @@
From e66885e66a2ce7fd916933b12d1ba523a25141e4 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Mon, 3 Oct 2022 13:25:05 +0100
Subject: [PATCH] Honour multilib paths
Upstream-Status: Pending
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39b9ad365f78..bf297e936a72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,8 @@ endif ()
# Set some nicer output dirs.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(JANSSON_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp)
# Give the debug version a different postfix for windows,
@@ -573,14 +573,14 @@ endif ()
#
# Allow the user to override installation directories.
-set(JANSSON_INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
+set(JANSSON_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
set(JANSSON_INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables")
set(JANSSON_INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
if(WIN32 AND NOT CYGWIN)
set(DEF_INSTALL_CMAKE_DIR cmake)
else()
- set(DEF_INSTALL_CMAKE_DIR lib/cmake/jansson)
+ set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/jansson)
endif()
set(JANSSON_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
@@ -633,8 +633,8 @@ option(JANSSON_INSTALL "Generate installation target" ON)
if (JANSSON_INSTALL)
install(TARGETS jansson
EXPORT janssonTargets
- LIBRARY DESTINATION "lib"
- ARCHIVE DESTINATION "lib"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "bin"
INCLUDES DESTINATION "include")
@@ -644,7 +644,7 @@ if (JANSSON_INSTALL)
# Install the pkg-config.
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/jansson.pc
- DESTINATION lib/pkgconfig)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
# Install the configs.
install(FILES
meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
-29
View File
@@ -1,29 +0,0 @@
From e5c38614fb7e0bdbcaec6db6133fa62cfed62818 Mon Sep 17 00:00:00 2001
From: Jaeyoon Jung <jaeyoon.jung@lge.com>
Date: Wed, 15 Jan 2025 22:11:54 +0900
Subject: [PATCH] Only export symbols starting with "json_" and "jansson_" for
cmake
It's already done by the commit 7c707a7 and bcb6b6f, but not for cmake.
This makes symbols in the same visibility as built with libtool.
Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
---
CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3394236..52b9934 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,6 +325,9 @@ if(JANSSON_BUILD_SHARED_LIBS)
# some linkers may only support --version-script
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/jansson.sym" "JANSSON_${JANSSON_SOVERSION} {
global:
+ json_*;
+ jansson_*;
+ local:
*;
};
")
meta-oe/recipes-extended/jansson/jansson_2.15.0.bb
-20
View File
@@ -1,20 +0,0 @@
SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data"
HOMEPAGE = "http://www.digip.org/jansson/"
BUGTRACKER = "https://github.com/akheron/jansson/issues"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537"
SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
file://0001-Honour-multilib-paths.patch \
file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
"
SRC_URI[sha256sum] = "a7eac7765000373165f9373eb748be039c10b2efc00be9af3467ec92357d8954"
UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
inherit cmake pkgconfig
EXTRA_OECMAKE = "-DJANSSON_BUILD_SHARED_LIBS=${@ 'OFF' if d.getVar('DISABLE_STATIC') == '' else 'ON' }"
BBCLASSEXTEND = "native"