4
4
## DP: GNU/kFreeBSD support. bz#356011
5
5
## DP: Added Hurd support.
7
Index: nss-3.14.3/mozilla/security/coreconf/Linux.mk
8
===================================================================
9
--- nss-3.14.3.orig/mozilla/security/coreconf/Linux.mk 2013-03-13 11:17:44.000000000 -0500
10
+++ nss-3.14.3/mozilla/security/coreconf/Linux.mk 2013-03-13 11:20:33.000000000 -0500
7
Index: nss/nss/lib/freebl/unix_rand.c
8
===================================================================
9
--- nss.orig/nss/lib/freebl/unix_rand.c 2013-06-15 19:17:07.382594525 +0900
10
+++ nss/nss/lib/freebl/unix_rand.c 2013-06-15 19:17:34.501768732 +0900
13
#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
14
|| defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) \
15
- || defined(NTO) || defined(__riscos__)
16
+ || defined(NTO) || defined(__riscos__) || defined(__GNU__) \
17
+ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
18
#include <sys/times.h>
20
#define getdtablesize() sysconf(_SC_OPEN_MAX)
21
Index: nss/nss/lib/softoken/softoken.h
22
===================================================================
23
--- nss.orig/nss/lib/softoken/softoken.h 2013-06-15 19:17:07.382594525 +0900
24
+++ nss/nss/lib/softoken/softoken.h 2013-06-15 19:17:34.505768610 +0900
27
#define CHECK_FORK_MIXED
30
+#elif defined(LINUX) || defined (__GLIBC__)
32
#define CHECK_FORK_PTHREAD
34
Index: nss/nss/lib/ssl/sslmutex.c
35
===================================================================
36
--- nss.orig/nss/lib/ssl/sslmutex.c 2013-06-15 19:17:07.382594525 +0900
37
+++ nss/nss/lib/ssl/sslmutex.c 2013-06-15 19:17:34.505768610 +0900
42
-#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
43
+#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)
47
Index: nss/nss/lib/ssl/sslmutex.h
48
===================================================================
49
--- nss.orig/nss/lib/ssl/sslmutex.h 2013-06-15 19:17:07.382594525 +0900
50
+++ nss/nss/lib/ssl/sslmutex.h 2013-06-15 19:17:34.505768610 +0900
55
-#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
56
+#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)
58
#include <sys/types.h>
60
Index: nss/nss/coreconf/arch.mk
61
===================================================================
62
--- nss.orig/nss/coreconf/arch.mk 2013-06-15 19:17:07.382594525 +0900
63
+++ nss/nss/coreconf/arch.mk 2013-06-15 19:17:34.501768732 +0900
65
ifneq ($(words $(OS_RELEASE)),1)
66
OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
71
+# This check must be last. Since all uses of OS_ARCH that follow affect only
72
+# userland, we can merge other Glibc systems with Linux here.
73
+ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
79
Index: nss/nss/coreconf/Linux.mk
80
===================================================================
81
--- nss.orig/nss/coreconf/Linux.mk 2013-06-15 19:16:59.150845133 +0900
82
+++ nss/nss/coreconf/Linux.mk 2013-06-15 19:17:34.501768732 +0900
48
132
MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
51
Index: nss-3.14.3/mozilla/security/coreconf/arch.mk
52
===================================================================
53
--- nss-3.14.3.orig/mozilla/security/coreconf/arch.mk 2013-03-13 11:17:44.000000000 -0500
54
+++ nss-3.14.3/mozilla/security/coreconf/arch.mk 2013-03-13 11:17:44.000000000 -0500
56
ifneq ($(words $(OS_RELEASE)),1)
57
OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
62
+# This check must be last. Since all uses of OS_ARCH that follow affect only
63
+# userland, we can merge other Glibc systems with Linux here.
64
+ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
70
Index: nss-3.14.3/mozilla/security/coreconf/config.mk
71
===================================================================
72
--- nss-3.14.3.orig/mozilla/security/coreconf/config.mk 2013-03-13 11:17:44.000000000 -0500
73
+++ nss-3.14.3/mozilla/security/coreconf/config.mk 2013-03-13 11:23:38.000000000 -0500
135
Index: nss/nss/coreconf/config.mk
136
===================================================================
137
--- nss.orig/nss/coreconf/config.mk 2013-06-15 19:16:59.154845011 +0900
138
+++ nss/nss/coreconf/config.mk 2013-06-15 19:17:34.501768732 +0900
75
140
#######################################################################
81
146
ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
82
147
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
83
Index: nss-3.14.3/mozilla/security/nss/lib/freebl/unix_rand.c
84
===================================================================
85
--- nss-3.14.3.orig/mozilla/security/nss/lib/freebl/unix_rand.c 2013-03-13 11:17:44.000000000 -0500
86
+++ nss-3.14.3/mozilla/security/nss/lib/freebl/unix_rand.c 2013-03-13 11:17:44.000000000 -0500
89
#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
90
|| defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) \
91
- || defined(NTO) || defined(__riscos__)
92
+ || defined(NTO) || defined(__riscos__) || defined(__GNU__) \
93
+ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
94
#include <sys/times.h>
96
#define getdtablesize() sysconf(_SC_OPEN_MAX)
97
Index: nss-3.14.3/mozilla/security/nss/lib/softoken/softoken.h
98
===================================================================
99
--- nss-3.14.3.orig/mozilla/security/nss/lib/softoken/softoken.h 2013-03-13 11:17:44.000000000 -0500
100
+++ nss-3.14.3/mozilla/security/nss/lib/softoken/softoken.h 2013-03-13 11:17:44.000000000 -0500
103
#define CHECK_FORK_MIXED
105
-#elif defined(LINUX)
106
+#elif defined(LINUX) || defined (__GLIBC__)
108
#define CHECK_FORK_PTHREAD
110
Index: nss-3.14.3/mozilla/security/nss/lib/ssl/sslmutex.c
111
===================================================================
112
--- nss-3.14.3.orig/mozilla/security/nss/lib/ssl/sslmutex.c 2013-03-13 11:17:44.000000000 -0500
113
+++ nss-3.14.3/mozilla/security/nss/lib/ssl/sslmutex.c 2013-03-13 11:17:44.000000000 -0500
118
-#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
119
+#if defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)
123
Index: nss-3.14.3/mozilla/security/nss/lib/ssl/sslmutex.h
124
===================================================================
125
--- nss-3.14.3.orig/mozilla/security/nss/lib/ssl/sslmutex.h 2013-03-13 11:17:44.000000000 -0500
126
+++ nss-3.14.3/mozilla/security/nss/lib/ssl/sslmutex.h 2013-03-13 11:17:44.000000000 -0500
131
-#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD)
132
+#elif defined(LINUX) || defined(AIX) || defined(BEOS) || defined(BSDI) || (defined(NETBSD) && __NetBSD_Version__ < 500000000) || defined(OPENBSD) || defined(__GLIBC__)
134
#include <sys/types.h>