From f3367212ef60f6ca2b1a26d6eda0d44ed5856ba1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 May 2015 08:24:54 +0200 Subject: [PATCH] nspr: try to unbreak musl build with hints from Alpine. --- srcpkgs/nspr/patches/fix-getproto.patch | 14 ++++++++++++++ srcpkgs/nspr/template | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nspr/patches/fix-getproto.patch diff --git a/srcpkgs/nspr/patches/fix-getproto.patch b/srcpkgs/nspr/patches/fix-getproto.patch new file mode 100644 index 00000000000..fde3faeebb2 --- /dev/null +++ b/srcpkgs/nspr/patches/fix-getproto.patch @@ -0,0 +1,14 @@ +--- nspr/pr/src/misc/prnetdb.c.orig ++++ nspr/pr/src/misc/prnetdb.c +@@ -61,10 +61,7 @@ + #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 diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index 9394a6e3237..110081aaa5a 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -1,7 +1,7 @@ # Template file for 'nspr' pkgname=nspr version=4.10.8 -revision=1 +revision=2 build_style=gnu-configure build_wrksrc="nspr" makedepends="zlib-devel" @@ -20,10 +20,10 @@ do_configure() { _args+=" --enable-64bit" fi - unset CFLAGS + CFLAGS+=" -D_PR_POLL_AVAILABLE -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO -D_PR_INET6_PROBE" ./configure --prefix=/usr --libdir=/usr/lib \ --includedir=/usr/include/nspr --enable-optimize \ - --enable-debug --with-pthreads ${_args} + --enable-debug --enable-ipv6 ${_args} } post_install() {