From ef58fff30eaa5d8213fb53b760c2e834ee1b38c7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 18:18:40 +0200
Subject: fix musl compile, patch from alpinelinux
---
package/nspr/Makefile | 2 +-
package/nspr/patches/patch-mozilla_nsprpub_configure | 6 +++---
.../patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c | 16 ++++++++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
create mode 100644 package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
(limited to 'package/nspr')
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index 590b01c9d..eaa679d95 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= nspr
PKG_VERSION:= 4.9.6
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 62b1e9d376d503d972f90c3c0031d879
PKG_DESCR:= Netscape Portable Runtime library
PKG_SECTION:= libs
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure
index 70465b40f..cfaa795ed 100644
--- a/package/nspr/patches/patch-mozilla_nsprpub_configure
+++ b/package/nspr/patches/patch-mozilla_nsprpub_configure
@@ -1,6 +1,6 @@
---- nspr-4.9.5.orig/mozilla/nsprpub/configure 2012-12-19 20:21:31.000000000 +0100
-+++ nspr-4.9.5/mozilla/nsprpub/configure 2013-02-27 16:43:20.000000000 +0100
-@@ -2848,7 +2849,7 @@ esac
+--- nspr-4.9.6.orig/mozilla/nsprpub/configure 2013-03-14 18:34:31.000000000 +0100
++++ nspr-4.9.6/mozilla/nsprpub/configure 2013-10-21 15:29:36.000000000 +0200
+@@ -2855,7 +2855,7 @@ esac
if test "$cross_compiling" = "yes"; then
CROSS_COMPILE=1
else
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c b/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
new file mode 100644
index 000000000..99ecc22dc
--- /dev/null
+++ b/package/nspr/patches/patch-mozilla_nsprpub_pr_src_misc_prnetdb_c
@@ -0,0 +1,16 @@
+* patch from alpinelinux
+
+--- nspr-4.9.6.orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2012-09-28 16:33:48.000000000 +0200
++++ nspr-4.9.6/mozilla/nsprpub/pr/src/misc/prnetdb.c 2013-10-21 18:07:57.000000000 +0200
+@@ -61,10 +61,7 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif
+
+-#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+- || (defined(LINUX) && defined(_REENTRANT) \
+- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
+- && !defined(ANDROID))
++#if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT))
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_GETPROTO_R_POINTER
+ #endif
--
cgit v1.2.3