diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2012-02-20 21:46:16 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2012-02-20 21:46:16 +0000 |
| commit | 555a867332df550fd7f33703f488b7474bbdc168 (patch) | |
| tree | 884c7a8b19eb3eeade22d400bb66cc566dfbdab0 /devel/nspr/files | |
| parent | update to 3.13.2 (diff) | |
update to 4.9
Diffstat (limited to 'devel/nspr/files')
| -rw-r--r-- | devel/nspr/files/patch-..::configure | 25 | ||||
| -rw-r--r-- | devel/nspr/files/patch-bugzilla-684758 | 11 | ||||
| -rw-r--r-- | devel/nspr/files/patch-tests | 9 |
3 files changed, 13 insertions, 32 deletions
diff --git a/devel/nspr/files/patch-..::configure b/devel/nspr/files/patch-..::configure index 90602869ecba..f722535ee774 100644 --- a/devel/nspr/files/patch-..::configure +++ b/devel/nspr/files/patch-..::configure @@ -1,6 +1,6 @@ ---- ../configure.orig 2009-05-08 15:12:31.000000000 +0200 -+++ ../configure 2009-06-17 09:18:56.000000000 +0200 -@@ -3508,7 +3508,7 @@ +--- ../configure.orig 2012-02-14 20:06:00.000000000 +0100 ++++ ../configure 2012-02-17 17:14:27.862323726 +0100 +@@ -4062,7 +4062,7 @@ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` if test "$MOZ_OBJFORMAT" = "elf"; then @@ -9,7 +9,7 @@ else DLL_SUFFIX=so.1.0 fi -@@ -5649,11 +5649,6 @@ +@@ -6271,11 +6271,6 @@ #define _THREAD_SAFE 1 EOF @@ -21,11 +21,12 @@ ;; *-netbsd*) if test "$ac_cv_have_dash_pthread" = "yes"; then -@@ -6037,6 +6032,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile +@@ -6694,6 +6689,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++ config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile + diff --git a/devel/nspr/files/patch-bugzilla-684758 b/devel/nspr/files/patch-bugzilla-684758 deleted file mode 100644 index efdb0c102451..000000000000 --- a/devel/nspr/files/patch-bugzilla-684758 +++ /dev/null @@ -1,11 +0,0 @@ ---- ../pr/src/pthreads/ptio.c 2011-09-02 12:14:24.000000000 +0200 -+++ ../pr/src/pthreads/ptio.c 2011-09-02 12:14:27.000000000 +0200 -@@ -1635,7 +1635,7 @@ - PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0); - return PR_FAILURE; - } -- if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0) -+ if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR | PR_POLL_HUP)) == 0) - { - PR_ASSERT(out_flags == 0); - PR_SetError(PR_IN_PROGRESS_ERROR, 0); diff --git a/devel/nspr/files/patch-tests b/devel/nspr/files/patch-tests index 39450f0527fb..d33d584643ce 100644 --- a/devel/nspr/files/patch-tests +++ b/devel/nspr/files/patch-tests @@ -1517,15 +1517,6 @@ PR_ResumeAll(); /* Wait for all threads to exit */ -@@ -212,6 +214,8 @@ - CreateThreadsUU(); - CreateThreadsKU(); - PR_Cleanup(); -+ -+ return 0; - } - - #endif /* XP_BEOS */ --- ../pr/tests/testfile.c Tue Jun 20 17:46:54 2000 +++ ../pr/tests/testfile.c Mon Jul 25 22:36:39 2005 @@ -69,4 +69,7 @@ |