[gentoo-commits] proj/mozilla:master commit in: dev-libs/nspr/files/, dev-libs/nspr/

[Jory Pratt]

commit:     4c1fb6898cf53c610d1cdb146fbfb80a9b60a3d6
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 15:14:32 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 15:14:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=4c1fb689

Add musl support

 dev-libs/nspr/files/nspr-4.10.10-musl-support.patch | 21 +++++++++++++++++++++
 .../{nspr-4.10.10.ebuild => nspr-4.10.10-r1.ebuild} |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch 
b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
new file mode 100644
index 0000000..0588414
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.10.10-musl-support.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Felix Janda <felix.ja...@posteo.de>
+# Date 1429558773 -7200
+#      Mon Apr 20 21:39:33 2015 +0200
+# Node ID 12494ff1de6cd7020c134d97b0b1ca81feb20520
+# Parent  c5cb946571388f1643ab0fb04b3bfacd93cf818e
+Fix compilation with musl libc - try 2
+
+diff -r c5cb94657138 -r 12494ff1de6c pr/src/misc/prnetdb.c
+--- a/pr/src/misc/prnetdb.c    Mon Apr 20 14:37:29 2015 -0400
++++ b/pr/src/misc/prnetdb.c    Mon Apr 20 21:39:33 2015 +0200
+@@ -63,8 +63,7 @@
+ 
+ #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+       || (defined(LINUX) && defined(_REENTRANT) \
+-        && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+-        && !defined(ANDROID))
++        && defined(__GLIBC__) && __GLIBC__ < 2)
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif

diff --git a/dev-libs/nspr/nspr-4.10.10.ebuild 
b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
similarity index 97%
rename from dev-libs/nspr/nspr-4.10.10.ebuild
rename to dev-libs/nspr/nspr-4.10.10-r1.ebuild
index af321ee..76a4fd2 100644
--- a/dev-libs/nspr/nspr-4.10.10.ebuild
+++ b/dev-libs/nspr/nspr-4.10.10-r1.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
        # We do not need to pass -L$libdir via nspr-config --libs
        epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+       # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
+       epatch "${FILESDIR}"/${P}-musl-support.patch
 
        # rename configure.in to configure.ac for new autotools compatibility
        if [[ -e "${S}"/nspr/configure.in ]] ; then