[gentoo-commits] repo/gentoo:master commit in: dev-libs/jansson/, dev-libs/jansson/files/

["Sam James" <sam@gentoo.org>]

commit:     2df0372e65704f40fa9529f36d468cec59dd8ca0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Nov 12 21:59:32 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 22:22:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df0372e

dev-libs/jansson: properly handle symbol names in tests

Closes: https://bugs.gentoo.org/814944
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../jansson/files/jansson-2.14-test-symbols.patch  | 22 ++++++++++++++++++++++
 dev-libs/jansson/jansson-2.14.ebuild               |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/dev-libs/jansson/files/jansson-2.14-test-symbols.patch b/dev-libs/jansson/files/jansson-2.14-test-symbols.patch
new file mode 100644
index 00000000000..013b2713231
--- /dev/null
+++ b/dev-libs/jansson/files/jansson-2.14-test-symbols.patch
@@ -0,0 +1,22 @@
+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

diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14.ebuild
index 1a7ac716c9c..42760f31153 100644
--- a/dev-libs/jansson/jansson-2.14.ebuild
+++ b/dev-libs/jansson/jansson-2.14.ebuild
@@ -16,6 +16,8 @@ IUSE="doc static-libs"
 
 BDEPEND="doc? ( dev-python/sphinx )"
 
+PATCHES=( "${FILESDIR}/${P}-test-symbols.patch" )
+
 multilib_src_configure() {
 	tc-ld-force-bfd