Bug#457573: nspr: FTBFS on hurd-i386

[Samuel Thibault]

Package: nspr
Version: 4.7.0~1.9b1-2
Severity: important
Tags: patch

Hello,

Apparently, during the merge of patches upstream forgot a few fixes,
leaving the package unbuildable on hurd-i386, here they are. (Yes,
libpthread on Hurd never produces value 0 for pthread_t, as pointed out
by its author himself.)

Samuel

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.23
Locale: LANG=fr_FR at euro, LC_CTYPE=fr_FR at euro (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
-------------- next part --------------
--- ./mozilla/nsprpub/pr/include/md/_pth.h.orig	2007-12-23 12:24:11.000000000 +0000
+++ ./mozilla/nsprpub/pr/include/md/_pth.h	2007-12-23 12:24:40.000000000 +0000
@@ -148,10 +148,6 @@
 	|| defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
 	|| defined(VMS) || defined(NTO) || defined(DARWIN) \
 	|| defined(UNIXWARE) || defined(RISCOS)
-#ifdef __GNU__
-/* Hurd pthreads don't have an invalid value for pthread_t. -- rmh */
-#error Using Hurd pthreads
-#endif
 #define _PT_PTHREAD_INVALIDATE_THR_HANDLE(t)  (t) = 0
 #define _PT_PTHREAD_THR_HANDLE_IS_INVALID(t)  (t) == 0
 #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
--- mozilla/nsprpub/pr/include/md/_linux.cfg.orig	2007-12-23 12:33:59.000000000 +0000
+++ mozilla/nsprpub/pr/include/md/_linux.cfg	2007-12-23 12:32:43.000000000 +0000
@@ -53,6 +53,8 @@
 
 #ifdef __FreeBSD_kernel__
 #define PR_AF_INET6 28  /* same as AF_INET6 */
+#elif defined(__GNU__)
+#define PR_AF_INET6 26  /* same as AF_INET6 */
 #else
 #define PR_AF_INET6 10  /* same as AF_INET6 */
 #endif
--- mozilla/nsprpub/pr/src/md/unix/uxrng.c.orig	2007-12-23 12:37:54.000000000 +0000
+++ mozilla/nsprpub/pr/src/md/unix/uxrng.c	2007-12-23 12:38:21.000000000 +0000
@@ -139,7 +139,8 @@
 }
 
 #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \
-    || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD))
+    || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD) \
+    || defined(__GNU__))
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>