diff mbox series

jansson: move to oe-core

Message ID 20260621121213.4003526-1-alex@linutronix.de
State Under Review
Headers show
Series jansson: move to oe-core | expand

Commit Message

Alexander Kanavin June 21, 2026, 12:12 p.m. UTC
Added in oe-core commit:
https://git.openembedded.org/openembedded-core/commit/?id=2b6e7d092b4a21930186682ebf085848b2e49de5

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../packagegroups/packagegroup-meta-oe.bb     |  1 -
 .../jansson/0001-Honour-multilib-paths.patch  | 63 -------------------
 ...ols-starting-with-json_-and-jansson_.patch | 29 ---------
 .../jansson/jansson_2.15.0.bb                 | 20 ------
 4 files changed, 113 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/jansson/jansson/0001-Honour-multilib-paths.patch
 delete mode 100644 meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
 delete mode 100644 meta-oe/recipes-extended/jansson/jansson_2.15.0.bb
diff mbox series

Patch

diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 7c2df00207..ea474349b2 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -348,7 +348,6 @@  RDEPENDS:packagegroup-meta-oe-extended = "\
     indent \
     iotop \
     isomd5sum \
-    jansson \
     jpnevulator \
     libblockdev \
     libcec \
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Honour-multilib-paths.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Honour-multilib-paths.patch
deleted file mode 100644
index 513d109459..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Honour-multilib-paths.patch
+++ /dev/null
@@ -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
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
deleted file mode 100644
index a1c17d1d8e..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
+++ /dev/null
@@ -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:
-           *;
- };
- ")
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb b/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb
deleted file mode 100644
index 829ac1ad49..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson_2.15.0.bb
+++ /dev/null
@@ -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"