-
Notifications
You must be signed in to change notification settings - Fork 1.2k
/
nss-build.patch
112 lines (101 loc) · 3.59 KB
/
nss-build.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
--- nss-3.17.1/nss/cmd/crmftest/Makefile 2014-09-23 21:09:22.000000000 +0200
+++ nss-3.17.1/nss/cmd/crmftest/Makefile 2014-10-03 12:57:19.715776517 +0200
@@ -55,7 +55,7 @@
LDDIST = $(DIST)/lib
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(LDDIST)/sectool.lib
+#EXTRA_LIBS += $(LDDIST)/sectool.lib
endif
include ../platrules.mk
--- nss-3.17.1/nss/cmd/shlibsign/Makefile 2014-09-23 21:09:22.000000000 +0200
+++ nss-3.17.1/nss/cmd/shlibsign/Makefile 2014-10-03 12:58:03.115792965 +0200
@@ -56,8 +56,8 @@
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
-MD_LIB_RELEASE_FILES = $(CHECKLOC)
-ALL_TRASH += $(CHECKLOC)
+MD_LIB_RELEASE_FILES = # $(CHECKLOC)
+#ALL_TRASH += $(CHECKLOC)
endif
#######################################################################
--- nss-3.17.1/nss/coreconf/rules.mk 2014-09-23 21:09:22.000000000 +0200
+++ nss-3.17.1/nss/coreconf/rules.mk 2014-10-03 12:57:19.714776541 +0200
@@ -223,7 +223,7 @@
endif # MSVC with manifest tool
endif
else
- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ $(MKSHLIB) $(LDFLAGS) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
chmod +x $@
endif
endif
@@ -268,7 +268,7 @@
PWD := $(shell pwd)
ifeq (,$(findstring ;,$(PATH)))
ifndef USE_MSYS
-PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
+#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
endif
endif
endif
--- nss-3.80/nss/coreconf/WIN32.mk
+++ nss-3.80/nss/coreconf/WIN32.mk
@@ -11,8 +11,6 @@
DEFAULT_COMPILER = cl
ifdef NS_USE_GCC
- CC = gcc
- CCC = g++
LD = ld
AR = ar
AR += cr $@
@@ -91,7 +89,7 @@ INSTALL = $(NSINSTALL)
GARBAGE += $(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb
XP_DEFINE += -DXP_PC
ifdef NS_USE_GCC
-LIB_SUFFIX = a
+LIB_SUFFIX = dll.a
else
LIB_SUFFIX = lib
endif
--- nss-3.17.1/nss/coreconf/WINNT.mk 2014-09-23 21:09:22.000000000 +0200
+++ nss-3.17.1/nss/coreconf/WINNT.mk 2014-10-03 12:57:19.715776517 +0200
@@ -14,7 +14,7 @@
#
# Win NT needs -GT so that fibers can work
#
-OS_CFLAGS += -GT
+#OS_CFLAGS += -GT
# WINNT uses the lib prefix, Win95 doesn't
NSPR31_LIB_PREFIX = lib
--- nss-3.33/nss/cmd/pk11ectest/manifest.mn 2017-11-13 09:34:13.417188600 +0300
+++ nss-3.33/nss/cmd/pk11ectest/manifest.mn 2017-11-13 09:34:19.366799400 +0300
@@ -13,4 +13,4 @@
PROGRAM = pk11ectest
-USE_STATIC_LIBS = 1
+#USE_STATIC_LIBS = 1
--- nss-3.33/nss/cmd/rsaperf/manifest.mn 2017-11-13 09:41:34.539284900 +0300
+++ nss-3.33/nss/cmd/rsaperf/manifest.mn 2017-11-13 09:41:38.458892000 +0300
@@ -21,4 +21,4 @@
PROGRAM = rsaperf
-USE_STATIC_LIBS = 1
+#USE_STATIC_LIBS = 1
--- nss-3.33/nss/cmd/platlibs.mk.orig 2017-11-13 10:14:28.414785800 +0300
+++ nss-3.33/nss/cmd/platlibs.mk 2017-11-13 10:14:56.929045300 +0300
@@ -199,6 +199,7 @@
$(DIST)/lib/$(IMPORT_LIB_PREFIX)smime3$(IMPORT_LIB_SUFFIX) \
$(DIST)/lib/$(IMPORT_LIB_PREFIX)ssl3$(IMPORT_LIB_SUFFIX) \
$(DIST)/lib/$(IMPORT_LIB_PREFIX)nss3$(IMPORT_LIB_SUFFIX) \
+ $(DIST)/lib/$(IMPORT_LIB_PREFIX)softokn3$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4$(IMPORT_LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4$(IMPORT_LIB_SUFFIX) \
--- nss-3.33/nss/coreconf/ruleset.mk 2021-12-17 15:29:47.547798900 +0100
+++ nss-3.33/nss/coreconf/ruleset.mk 2021-12-17 15:30:46.829214000 +0100
@@ -97,7 +97,7 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
ifndef RES
- RES := $(OBJDIR)/$(LIBRARY_NAME).res
+ RES := $(OBJDIR)/$(LIBRARY_NAME).res.o
endif
ifndef RESNAME
RESNAME := $(LIBRARY_NAME).rc