diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-11-13 13:10:00 +0000 |
| commit | e9d044d4b9b71200a96adfa280848858c0f468c9 (patch) | |
| tree | 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /dev-libs/jansson | |
| parent | fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff) | |
gentoo resync : 13.11.2021
Diffstat (limited to 'dev-libs/jansson')
| -rw-r--r-- | dev-libs/jansson/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/jansson/files/jansson-2.14-test-symbols.patch | 25 | ||||
| -rw-r--r-- | dev-libs/jansson/jansson-2.14.ebuild | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest index 8dbf118205b6..af573d471c8b 100644 --- a/dev-libs/jansson/Manifest +++ b/dev-libs/jansson/Manifest @@ -1,6 +1,7 @@ AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7 +AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69 -EBUILD jansson-2.14.ebuild 878 BLAKE2B bcf501239b88fe0e185d155a7bd053599a5ee682e94f461a865bd6a28b31df845d9f0512e8ebef8c0fa8cd4cc42f08f14c30a50c583661f9621e77e72e35bd19 SHA512 859fbbe220b20b915ad63a3cd859207c49a6bbd5258a1a111e7059fcbb1a4fc096d9bd9f3eb5ba8497b4fe5eeadc40dcc2ace065c28239695e77eb92d36a3f03 +EBUILD jansson-2.14.ebuild 928 BLAKE2B 46ae236379d62540e30094dafa0b8225277f5acded47c683e40af991df699760ffce98e1bf52b4b72210f629b31558b5dc298d3543af13f1117df2b7878c36a1 SHA512 797ba2a7f615d13bbaccd7cb8e39b524e54320e44374f4d36353d4f8a2050cc2331dd9b8a1c083c33cebe9cc1bb348359720fcd05fc068a0dddbeaa8ab346d26 MISC metadata.xml 395 BLAKE2B 414a914de07c51b1fae68121cbeeff2b4975fa351e068d250c7d88f6ac8832a2c954f311f547494e10a78dbc5b9b7ccd1fdbb46335f28bac7b23cb5aa13050ba SHA512 067ae2c24fdd77747a78590731e1946bc0a2150038e9722d60ef97c428538046f20843bea2bd970d9591c7f7dbbef2fd81b605fcc2d67daaa55551cfd3d7dd24 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 000000000000..a5bf53347218 --- /dev/null +++ b/dev-libs/jansson/files/jansson-2.14-test-symbols.patch @@ -0,0 +1,25 @@ +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 diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14.ebuild index 396096cda49d..42760f311531 100644 --- a/dev-libs/jansson/jansson-2.14.ebuild +++ b/dev-libs/jansson/jansson-2.14.ebuild @@ -11,11 +11,13 @@ 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" IUSE="doc static-libs" BDEPEND="doc? ( dev-python/sphinx )" +PATCHES=( "${FILESDIR}/${P}-test-symbols.patch" ) + multilib_src_configure() { tc-ld-force-bfd |