From 8e8931b0bc067ceb99c60868c35236e0c1906db9 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 13 Oct 2015 12:50:49 +0300 Subject: [PATCH] nspr: fix build --- dev-libs/nspr/nspr-4.10.8.recipe | 2 +- dev-libs/nspr/patches/nspr-4.10.8.patchset | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-libs/nspr/nspr-4.10.8.recipe b/dev-libs/nspr/nspr-4.10.8.recipe index 9ca6dfccb..e1f0bcf98 100644 --- a/dev-libs/nspr/nspr-4.10.8.recipe +++ b/dev-libs/nspr/nspr-4.10.8.recipe @@ -13,7 +13,7 @@ COPYRIGHT="Mozilla Foundation" HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$portVersion/src/nspr-$portVersion.tar.gz" CHECKSUM_SHA256="507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15" -REVISION="1" +REVISION="2" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="nspr-$portVersion/nspr" diff --git a/dev-libs/nspr/patches/nspr-4.10.8.patchset b/dev-libs/nspr/patches/nspr-4.10.8.patchset index 6007e98da..bc0913afe 100644 --- a/dev-libs/nspr/patches/nspr-4.10.8.patchset +++ b/dev-libs/nspr/patches/nspr-4.10.8.patchset @@ -231,18 +231,18 @@ index da2f7e9..cbef872 100644 #include #include diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c -index b86248f..0f07192 100644 +index b86248f..c53d56e 100644 --- a/pr/src/misc/prnetdb.c +++ b/pr/src/misc/prnetdb.c -@@ -54,7 +54,7 @@ PRLock *_pr_dnsLock = NULL; - * Some return a pointer to struct protoent, others return - * an int, and glibc's flavor takes five arguments. +@@ -1154,7 +1154,7 @@ PR_IMPLEMENT(PRStatus) PR_GetHostByAddr( + * any usable implementation. */ --#if defined(XP_BEOS) && defined(BONE_VERSION) -+#if defined(HAIKU) || (defined(XP_BEOS) && defined(BONE_VERSION)) - #include /* pick up define for inet_addr */ - #include - #define _PR_HAVE_GETPROTO_R + +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(HAIKU) + /* Android's Bionic libc system includes prototypes for these in netdb.h, + * but doesn't actually include implementations. It uses the 5-arg form, + * so these functions end up not matching the prototype. So just rename diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c index 125f1f9..fe51684 100644 --- a/pr/src/pthreads/ptio.c