This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
/
3.30.2-cygwin.patch
271 lines (256 loc) · 9.33 KB
/
3.30.2-cygwin.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
--- origsrc/nss-3.30.2/nss/cmd/shlibsign/sign.sh 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/cmd/shlibsign/sign.sh 2017-04-30 11:27:45.446256800 -0500
@@ -11,6 +11,14 @@
# 5: full path to library that is to be signed
case "${3}" in
+CYGWIN*)
+ PATH="${1}/lib:${1}/bin:${PATH}"
+ export PATH
+ ADDON_PATH=${1}/lib:${4}:$ADDON_PATH
+ export ADDON_PATH
+ echo ${2}/shlibsign -v -i ${5}
+ ${2}/shlibsign -v -i ${5}
+ ;;
WIN*)
if echo "${PATH}" | grep -c \; >/dev/null; then
PATH=${1}/lib\;${1}/bin\;${4}\;${PATH}
--- origsrc/nss-3.30.2/nss/coreconf/CYGWIN.mk 1969-12-31 18:00:00.000000000 -0600
+++ src/nss-3.30.2/nss/coreconf/CYGWIN.mk 2017-04-30 11:18:08.492186300 -0500
@@ -0,0 +1,145 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+XP_DEFINE += -DXP_UNIX
+AR = ar cr $@
+LDOPTS += -L$(SOURCE_LIB_DIR)
+LIB_PREFIX = lib
+LIB_SUFFIX = a
+DLL_PREFIX = cyg
+DLL_SUFFIX = dll
+IMPORT_LIB_SUFFIX = .dll.a
+DYNAMIC_LIB_SUFFIX_FOR_LINKING = $(IMPORT_LIB_SUFFIX)
+PROG_SUFFIX = .exe
+
+ifdef BUILD_OPT
+ OPTIMIZER += -O
+ DEFINES += -UDEBUG -DNDEBUG
+else
+ OPTIMIZER += -g
+ DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
+endif
+
+ifdef BUILD_TREE
+NSINSTALL_DIR = $(BUILD_TREE)/nss
+NSINSTALL = $(BUILD_TREE)/nss/nsinstall
+else
+NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall
+NSINSTALL = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
+endif
+
+MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend
+MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend
+MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk
+
+####################################################################
+#
+# One can define the makefile variable NSDISTMODE to control
+# how files are published to the 'dist' directory. If not
+# defined, the default is "install using relative symbolic
+# links". The two possible values are "copy", which copies files
+# but preserves source mtime, and "absolute_symlink", which
+# installs using absolute symbolic links.
+# - THIS IS NOT PART OF THE NEW BINARY RELEASE PLAN for 9/30/97
+# - WE'RE KEEPING IT ONLY FOR BACKWARDS COMPATIBILITY
+####################################################################
+
+INSTALL = $(NSINSTALL) -t
+
+define MAKE_OBJDIR
+if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
+endef
+
+#
+# The default implementation strategy for Cygwin is pthreads
+#
+USE_PTHREADS = 1
+IMPL_STRATEGY = _PTH
+
+CC = gcc
+CCC = g++
+RANLIB = ranlib
+
+DEFAULT_COMPILER = gcc
+
+OS_REL_CFLAGS = -DCYGWIN
+
+ifeq ($(OS_TEST),x86_64)
+ CPU_ARCH = x86_64
+ USE_64 = 1
+else
+ OS_REL_CFLAGS += -Di386
+ CPU_ARCH = x86
+endif
+
+#ifdef BUILD_OPT
+# OPTIMIZER = -O2
+#endif
+
+ifdef USE_PTHREADS
+ DEFINES += -D_REENTRANT
+endif
+
+ifeq ($(USE_PTHREADS),1)
+OS_PTHREAD = -lpthread
+endif
+
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -pipe -DHAVE_STRERROR -I/usr/include/nspr
+OS_LIBS = $(OS_PTHREAD)
+
+MKSHLIB = $(CC) -shared -Wl,--enable-auto-image-base $(_GEN_IMPORT_LIB) $(LDFLAGS)
+
+ARCH = cygwin
+
+DSO_CFLAGS = -DPIC -DDLL_EXPORT
+DSO_LDOPTS = -shared $(ARCHFLAG)
+DSO_LDFLAGS =
+LDFLAGS += $(ARCHFLAG)
+
+ifdef LIBRARY_NAME
+ SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
+ IMPORT_LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX)$(IMPORT_LIB_SUFFIX)
+ _GEN_IMPORT_LIB = -Wl,--out-implib,$(IMPORT_LIBRARY)
+endif
+
+ifndef TARGETS
+ TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(PROGRAM)
+endif
+
+USE_SYSTEM_ZLIB = 1
+ZLIB_LIBS = -lz
+
--- origsrc/nss-3.30.2/nss/coreconf/arch.mk 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/coreconf/arch.mk 2017-04-30 11:27:55.045876200 -0500
@@ -197,7 +197,7 @@ endif
#
ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH)))
OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH))
- OS_ARCH = WINNT
+ OS_ARCH = CYGWIN
ifndef CPU_ARCH
ifeq (WOW64,$(findstring WOW64,$(OS_RELEASE)))
OS_RELEASE := $(patsubst %-WOW64,%,$(OS_RELEASE))
@@ -206,7 +206,7 @@ ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$
#
# Cygwin's uname -m returns "i686" on a Pentium Pro machine.
#
- ifneq (,$(findstring 86,$(CPU_ARCH)))
+ ifneq (,$(findstring i686,$(CPU_ARCH)))
CPU_ARCH = x386
endif
endif
--- origsrc/nss-3.30.2/nss/coreconf/config.mk 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/coreconf/config.mk 2017-04-30 11:27:55.051878300 -0500
@@ -31,7 +31,7 @@ endif
#######################################################################
TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
- AIX RISCOS WINNT WIN95 Linux Android
+ AIX RISCOS WINNT WIN95 Linux Android CYGWIN
ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
--- origsrc/nss-3.30.2/nss/gtests/common/gtest.mk 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/gtests/common/gtest.mk 2017-04-30 11:27:32.436806000 -0500
@@ -7,7 +7,7 @@
include $(CORE_DEPTH)/cmd/platlibs.mk
MKPROG = $(CCC)
-MKSHLIB = $(CCC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
+MKSHLIB = $(CCC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) $(_GEN_IMPORT_LIB)
# gtests pick up errors with signed/unsigned comparisons on some platforms
# even though we disabled -Wsign-compare.
@@ -32,5 +32,5 @@ ifeq (WINNT,$(OS_ARCH))
# Needed because we include files from a subdirectory
MAKE_OBJDIR = $(INSTALL) -D $(dir $@)
else
- CXXFLAGS += -std=c++0x
+ CXXFLAGS += -std=c++0x -D_POSIX_C_SOURCE=200809L
endif
--- origsrc/nss-3.30.2/nss/lib/Makefile 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/lib/Makefile 2017-04-30 11:27:55.055878400 -0500
@@ -37,10 +37,8 @@ endif
endif
ifndef MOZILLA_CLIENT
-ifeq ($(OS_ARCH),Linux)
SYSINIT_SRCDIR = sysinit # Add the sysinit directory to DIRS.
endif
-endif
ifndef NSS_DISABLE_DBM
DBM_SRCDIR = dbm # Add the dbm directory to DIRS.
--- origsrc/nss-3.30.2/nss/lib/ckfw/builtins/config.mk 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/lib/ckfw/builtins/config.mk 2017-04-30 11:27:55.060877600 -0500
@@ -10,7 +10,6 @@
TARGETS = $(SHARED_LIBRARY)
LIBRARY =
-IMPORT_LIBRARY =
PROGRAM =
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
--- origsrc/nss-3.30.2/nss/lib/freebl/config.mk 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/lib/freebl/config.mk 2017-04-30 11:27:55.064877900 -0500
@@ -38,7 +38,6 @@ else
TARGETS = $(SHARED_LIBRARY)
LIBRARY =
-IMPORT_LIBRARY =
PROGRAM =
ifeq ($(OS_TARGET), SunOS)
--- origsrc/nss-3.30.2/nss/lib/freebl/unix_rand.c 2017-04-20 09:25:50.000000000 -0500
+++ src/nss-3.30.2/nss/lib/freebl/unix_rand.c 2017-04-30 11:27:55.069879000 -0500
@@ -160,7 +160,7 @@ RNG_kstat(PRUint32 *fed)
#endif
-#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) || defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) || defined(NTO) || defined(__riscos__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__)
+#if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) || defined(NETBSD) || defined(DARWIN) || defined(OPENBSD) || defined(NTO) || defined(__riscos__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__) || defined(__CYGWIN__)
#include <sys/times.h>
#define getdtablesize() sysconf(_SC_OPEN_MAX)
--- origsrc/nss-3.45/nss/lib/sysinit/nsssysinit.c 2019-07-05 12:02:31.000000000 -0400
+++ src/nss-3.45/nss/lib/sysinit/nsssysinit.c 2019-07-29 17:03:01.979419200 -0400
@@ -15,10 +15,6 @@
* of pkcs11 modules common to all applications.
*/
-#ifndef LINUX
-#error __FILE__ only builds on Linux.
-#endif
-
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>