diff options
| author |   Violet Purcell <vimproved@inventati.org> | 2023-06-10 04:46:44 +0000 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2023-06-10 09:54:51 +0300 |
| commit | 5caead31afd6d66482e29c075b2a21675cb99015 (patch) | |
| tree | 01a00849981ce0bd44c97f938cc257106f734ffa /dev-libs/nspr | |
| parent | app-i18n/man-pages-l10n: Stabilize 4.18.1-r1 ALLARCHES, #908209 (diff) | |
| download | gentoo-5caead31afd6d66482e29c075b2a21675cb99015.tar.gz gentoo-5caead31afd6d66482e29c075b2a21675cb99015.tar.bz2 gentoo-5caead31afd6d66482e29c075b2a21675cb99015.zip | |
dev-libs/nspr: Fix Musl ipv6 patch for Musl 1.2.4
Closes: https://bugs.gentoo.org/906166
Signed-off-by: Violet Purcell <vimproved@inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31370
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'dev-libs/nspr')
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch | 26 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.35-r2.ebuild (renamed from dev-libs/nspr/nspr-4.35-r1.ebuild) | 0 |
2 files changed, 9 insertions, 17 deletions
diff --git a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch index 2c8ebd4ccbb2..72393ca5f470 100644 --- a/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch +++ b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch @@ -1,19 +1,11 @@ -From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001 -From: Moritz Kick <gentoo@blackphoenix.de> -Date: Wed, 20 Mar 2019 13:36:06 -0500 +From 2e6a43c751707b6983760669988ba4d2826ffd5b Mon Sep 17 00:00:00 2001 +From: Violet Purcell <vimproved@inventati.org> +Date: Sat, 10 Jun 2023 04:37:55 +0000 Subject: [PATCH] Added IPv6 compatibility for musl libc -Signed-off-by: Moritz Kick <gentoo@blackphoenix.de> -Signed-off-by: Jory Pratt <anarchy@gentoo.org> ---- - pr/include/md/_linux.h | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h -index 2370ab8..612184c 100644 --- a/pr/include/md/_linux.h +++ b/pr/include/md/_linux.h -@@ -289,33 +289,22 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) +@@ -315,33 +315,19 @@ static inline PRInt32 _MD_ATOMIC_SET(PRInt32 *ptr, PRInt32 nv) #endif /* __arm__ */ #define USE_SETJMP @@ -22,17 +14,17 @@ index 2370ab8..612184c 100644 -#endif #undef _PR_USE_POLL #define _PR_STAT_HAS_ONLY_ST_ATIME - #if defined(__alpha) || defined(__ia64__) +-#if defined(__alpha) || defined(__ia64__) #define _PR_HAVE_LARGE_OFF_T -#elif (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ - || defined(ANDROID) -#define _PR_HAVE_OFF64_T - #else +-#else -#define _PR_NO_LARGE_FILES -+#define _PR_HAVE_OFF64_T - #endif +-#endif -#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ - || defined(ANDROID) ++#define _FILE_OFFSET_BITS 64 #define _PR_INET6 #define _PR_HAVE_INET_NTOP #define _PR_HAVE_GETHOSTBYNAME2 @@ -49,5 +41,5 @@ index 2370ab8..612184c 100644 #define _PR_HAVE_GETHOST_R_INT #endif -- -2.21.0 +2.41.0 diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild b/dev-libs/nspr/nspr-4.35-r2.ebuild index efca76733c93..efca76733c93 100644 --- a/dev-libs/nspr/nspr-4.35-r1.ebuild +++ b/dev-libs/nspr/nspr-4.35-r2.ebuild |