diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2019-03-20 13:40:30 -0500 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2019-03-20 13:40:30 -0500 |
| commit | a5e1a60b36bbf7b69a5c02d4799d061b2f8c792d (patch) | |
| tree | 6725ee5ab8d7b4bf5cea901a6f91bbd75ba5ab92 | |
| parent | All eclass changes are in main tree (diff) | |
| download | mozilla-a5e1a60b36bbf7b69a5c02d4799d061b2f8c792d.tar.gz mozilla-a5e1a60b36bbf7b69a5c02d4799d061b2f8c792d.tar.bz2 mozilla-a5e1a60b36bbf7b69a5c02d4799d061b2f8c792d.zip | |
dev-libs/nspr: re-add support for ipv6 on musl
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
| -rw-r--r-- | dev-libs/nspr/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch | 53 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.21.ebuild | 2 |
3 files changed, 55 insertions, 1 deletions
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 64e6370a..0b2c630f 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,2 +1 @@ -DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c 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 new file mode 100644 index 00000000..2c8ebd4c --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.21-ipv6-musl-support.patch @@ -0,0 +1,53 @@ +From 8c57451f44d7ceb37bfb4ae6e457fc70b1f58d0a Mon Sep 17 00:00:00 2001 +From: Moritz Kick <gentoo@blackphoenix.de> +Date: Wed, 20 Mar 2019 13:36:06 -0500 +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) + #endif /* __arm__ */ + + #define USE_SETJMP +-#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(ANDROID) + #define _PR_POLL_AVAILABLE +-#endif + #undef _PR_USE_POLL + #define _PR_STAT_HAS_ONLY_ST_ATIME + #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 +-#define _PR_NO_LARGE_FILES ++#define _PR_HAVE_OFF64_T + #endif +-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) \ +- || defined(ANDROID) + #define _PR_INET6 + #define _PR_HAVE_INET_NTOP + #define _PR_HAVE_GETHOSTBYNAME2 + #define _PR_HAVE_GETADDRINFO + #define _PR_INET6_PROBE +-#endif + #ifndef ANDROID + #define _PR_HAVE_SYSV_SEMAPHORES + #define PR_HAVE_SYSV_NAMED_SHARED_MEMORY +-#endif +-/* Android has gethostbyname_r but not gethostbyaddr_r or gethostbyname2_r. */ +-#if (__GLIBC__ >= 2) && defined(_PR_PTHREADS) + #define _PR_HAVE_GETHOST_R + #define _PR_HAVE_GETHOST_R_INT + #endif +-- +2.21.0 + diff --git a/dev-libs/nspr/nspr-4.21.ebuild b/dev-libs/nspr/nspr-4.21.ebuild index 809295b3..8b439587 100644 --- a/dev-libs/nspr/nspr-4.21.ebuild +++ b/dev-libs/nspr/nspr-4.21.ebuild @@ -35,6 +35,8 @@ src_prepare() { default + use elibc_musl? && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch + # rename configure.in to configure.ac for new autotools compatibility if [[ -e "${S}"/nspr/configure.in ]] ; then einfo "Renaming configure.in to configure.ac" |