From 3a0e100e02e1c6c2818268f57eae51095cee35af Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 Oct 2023 12:14:42 +0100
Subject: gentoo auto-resync : 12:10:2023 - 12:14:42

---
 dev-libs/jansson/Manifest                          |  2 +
 .../files/jansson-2.14-default-symver-test.patch   | 55 ++++++++++++++++++++++
 dev-libs/jansson/jansson-2.14-r2.ebuild            | 49 +++++++++++++++++++
 3 files changed, 106 insertions(+)
 create mode 100644 dev-libs/jansson/files/jansson-2.14-default-symver-test.patch
 create mode 100644 dev-libs/jansson/jansson-2.14-r2.ebuild

(limited to 'dev-libs/jansson')

diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 59f514d358ee..8d9b480dc8a3 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,4 +1,6 @@
+AUX jansson-2.14-default-symver-test.patch 1604 BLAKE2B 5a18c4723997e7ed668ae34516c2fa6c8bee5acda747d6ad180213f427070f1c65a7c7970b594e1b77549c53f7aeb208149e038213bf00f49d350d3c25149729 SHA512 396b1c259549b41ac8ecef9be252f9f7d6fd611ae0890ae4f38ad44e3fe3937647891eb45ed340119ee62dae11b8fb5c8865865bcd226e689161bc5a9ee26e12
 AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
 EBUILD jansson-2.14-r1.ebuild 853 BLAKE2B 3e38a4341110c9439cd6ebc0120ed105394362699e35cfbabd9bdc1175300fd7fde305b2d549cbee83f2514bf93e27a32ae17916c553f255d25d6807c21dd457 SHA512 db0d69739bb11215c7439634509f0c60f4aab3e7b919a5e79dc04da9b51134b7b3a7c48f6eb3817b2318bd58175f36a07ffad28160d3118a6564a2045dcab855
+EBUILD jansson-2.14-r2.ebuild 934 BLAKE2B 20d9bfb3ee3bae1eea1418ad73be4201a0aad225e00c3bf7c4ed34a65a53b13358a05961b03f58f5792f1940adfd3f535f77eaf2e594c6aec0ffb9b1cb867743 SHA512 73b829acf360221806f6b0b5e00be5a7e39cde220dff718027ace8ab7988fa37b56a68d8daa5c18eda572e12beeef9e98524fd658c3d24d8ad3f83d0df668e28
 MISC metadata.xml 475 BLAKE2B 9cc60096cb39c1f472a534fd3a1e32da41f251b7f9601e10bd64164f3aa46fef7b492f8c2902b09ea56ac185de146e9c32014d5c741542cce2b5b289864d983a SHA512 7412836cd76c643dd976b26732d827d7efd607d87cecf79ef7d27815e7a14bba4210ee33c01c4f6da5193068c8662fd857935bb1e304edd81a86ae2bf3094ca1
diff --git a/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch
new file mode 100644
index 000000000000..0da70dc5afcb
--- /dev/null
+++ b/dev-libs/jansson/files/jansson-2.14-default-symver-test.patch
@@ -0,0 +1,55 @@
+From https://github.com/akheron/jansson/pull/666/commits/1e2ac681e5f39fc7a7e8b8deb2162a93976d4622 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Wed, 11 Oct 2023 20:51:57 -0400
+Subject: [PATCH] Port check for --default-symver to autoconf
+
+This commit ports the configure check for -Wl,--default-symver that is
+present in CMake to autoconf. This fixes building Jansson via autoconf
+with non-bfd linkers on glibc systems.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,9 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT8_T
+ AC_TYPE_LONG_LONG_INT
+ 
++jansson_soversion="4"
++AC_SUBST([jansson_soversion])
++
+ AC_C_INLINE
+ case $ac_cv_c_inline in
+     yes) json_inline=inline;;
+@@ -138,8 +141,12 @@ AS_IF([test "x$with_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbol
+ AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
+ 
+ # Enable symbol versioning on GNU libc
++m4_pattern_forbid([^AX_CHECK_LINK_FLAG$])
+ JSON_SYMVER_LDFLAGS=
+-AC_CHECK_DECL([__GLIBC__], [JSON_SYMVER_LDFLAGS=-Wl,--default-symver])
++AC_CHECK_DECL([__GLIBC__],
++  [AX_CHECK_LINK_FLAG([-Wl,--default-symver],
++    [JSON_SYMVER_LDFLAGS=-Wl,--default-symver],
++    [JSON_SYMVER_LDFLAGS=-Wl,--version-script,$ac_abs_confdir/jansson.sym])])
+ AC_SUBST([JSON_SYMVER_LDFLAGS])
+ 
+ AC_ARG_ENABLE([ossfuzzers],
+@@ -168,6 +175,7 @@ AC_SUBST([AM_CFLAGS])
+ 
+ AC_CONFIG_FILES([
+         jansson.pc
++	jansson.sym
+         Makefile
+         doc/Makefile
+         src/Makefile
+--- /dev/null
++++ b/jansson.sym.in
+@@ -0,0 +1,5 @@
++JANSSON_@jansson_soversion@ {
++	global:
++	*;
++};
++
+-- 
+2.42.0
+
diff --git a/dev-libs/jansson/jansson-2.14-r2.ebuild b/dev-libs/jansson/jansson-2.14-r2.ebuild
new file mode 100644
index 000000000000..8f8601ce9046
--- /dev/null
+++ b/dev-libs/jansson/jansson-2.14-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
+HOMEPAGE="https://www.digip.org/jansson/"
+SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc static-libs"
+
+BDEPEND="
+	sys-devel/autoconf-archive
+	doc? ( dev-python/sphinx )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-default-symver-test.patch"
+	"${FILESDIR}/${P}-test-symbols.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		emake html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3