mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-libs/jansson: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
@@ -1,57 +0,0 @@
|
||||
https://github.com/akheron/jansson/pull/666
|
||||
|
||||
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
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
https://bugs.gentoo.org/814944
|
||||
https://github.com/akheron/jansson/commit/0677666f65b988b2dd44d02966a08fea490d5883
|
||||
|
||||
From 0677666f65b988b2dd44d02966a08fea490d5883 Mon Sep 17 00:00:00 2001
|
||||
From: Petri Lehtinen <petri@digip.org>
|
||||
Date: Thu, 9 Sep 2021 21:53:11 +0300
|
||||
Subject: [PATCH] Fix the check-exports tests for versioned symbols
|
||||
|
||||
---
|
||||
test/suites/api/check-exports | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/suites/api/check-exports b/test/suites/api/check-exports
|
||||
index 2b6b3c79..5c82064c 100755
|
||||
--- a/test/suites/api/check-exports
|
||||
+++ b/test/suites/api/check-exports
|
||||
@@ -15,7 +15,7 @@ grep 'json_\|jansson_' $top_srcdir/src/jansson.def \
|
||||
nm -D $SOFILE >/dev/null >$test_log/symbols 2>/dev/null \
|
||||
|| exit 77 # Skip if "nm -D" doesn't seem to work
|
||||
|
||||
-grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | grep -v '^_' | sort >$test_log/output
|
||||
+grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | grep -v '^_' | sed 's/@@libjansson.*//' | sort >$test_log/output
|
||||
|
||||
if ! cmp -s $test_log/exports $test_log/output; then
|
||||
diff -u $test_log/exports $test_log/output >&2
|
||||
Reference in New Issue
Block a user