nss.patch (e32eb42e) nss.patch (e0ac9675)
1diff -ur misc/nss-3.25/nspr/config/rules.mk misc/build/nss-3.25/nspr/config/rules.mk
2--- misc/nss-3.25/nspr/config/rules.mk 2016-02-12 05:51:25.000000000 -0800
3+++ misc/build/nss-3.25/nspr/config/rules.mk 2016-07-14 23:47:54.492034000 -0700
4@@ -382,7 +382,12 @@
5 ifdef NS_USE_GCC
6 $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
7 else
8- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<

--- 90 unchanged lines hidden (view full) ---

99-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
100+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
101 endif
102 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
103
104diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk misc/build/nss-3.25/nss/coreconf/Darwin.mk
105--- misc/nss-3.25/nss/coreconf/Darwin.mk 2016-06-20 10:11:28.000000000 -0700
106+++ misc/build/nss-3.25/nss/coreconf/Darwin.mk 2016-07-14 23:47:54.560325000 -0700
1diff -ur misc/nss-3.25/nspr/config/rules.mk misc/build/nss-3.25/nspr/config/rules.mk
2--- misc/nss-3.25/nspr/config/rules.mk 2016-02-12 05:51:25.000000000 -0800
3+++ misc/build/nss-3.25/nspr/config/rules.mk 2016-07-14 23:47:54.492034000 -0700
4@@ -382,7 +382,12 @@
5 ifdef NS_USE_GCC
6 $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
7 else
8- $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<

--- 90 unchanged lines hidden (view full) ---

99-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
100+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX)
101 endif
102 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
103
104diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk misc/build/nss-3.25/nss/coreconf/Darwin.mk
105--- misc/nss-3.25/nss/coreconf/Darwin.mk 2016-06-20 10:11:28.000000000 -0700
106+++ misc/build/nss-3.25/nss/coreconf/Darwin.mk 2016-07-14 23:47:54.560325000 -0700
107@@ -6,10 +6,12 @@
107@@ -4,12 +4,14 @@
108 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
109
108 include $(CORE_DEPTH)/coreconf/UNIX.mk
110 include $(CORE_DEPTH)/coreconf/UNIX.mk
109 include $(CORE_DEPTH)/coreconf/Werror.mk
111-include $(CORE_DEPTH)/coreconf/Werror.mk
112+#include $(CORE_DEPTH)/coreconf/Werror.mk
110
111-DEFAULT_COMPILER = gcc
112+DEFAULT_COMPILER = cc
113+
114+# CC is taken from environment automatically.
115+#CC = cc
113
114-DEFAULT_COMPILER = gcc
115+DEFAULT_COMPILER = cc
116+
117+# CC is taken from environment automatically.
118+#CC = cc
116+CCC = $(CXX)
119+CCC = $(CXX) -stdlib=libc++
117
118-CC = gcc
119-CCC = g++
120 RANLIB = ranlib
121
122 ifndef CPU_ARCH
123diff -ur misc/nss-3.25/nss/coreconf/FreeBSD.mk misc/build/nss-3.25/nss/coreconf/FreeBSD.mk
124--- misc/nss-3.25/nss/coreconf/FreeBSD.mk 2016-06-20 10:11:28.000000000 -0700

--- 130 unchanged lines hidden (view full) ---

255- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
256+ if (strm == Z_NULL || strm->state == Z_NULL) return ~0UL << 16;
257 state = (struct inflate_state FAR *)strm->state;
258- return ((long)(state->back) << 16) +
259+ return ((unsigned long)(state->back) << 16) +
260 (state->mode == COPY ? state->length :
261 (state->mode == MATCH ? state->was - state->length : 0));
262 }
120
121-CC = gcc
122-CCC = g++
123 RANLIB = ranlib
124
125 ifndef CPU_ARCH
126diff -ur misc/nss-3.25/nss/coreconf/FreeBSD.mk misc/build/nss-3.25/nss/coreconf/FreeBSD.mk
127--- misc/nss-3.25/nss/coreconf/FreeBSD.mk 2016-06-20 10:11:28.000000000 -0700

--- 130 unchanged lines hidden (view full) ---

258- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
259+ if (strm == Z_NULL || strm->state == Z_NULL) return ~0UL << 16;
260 state = (struct inflate_state FAR *)strm->state;
261- return ((long)(state->back) << 16) +
262+ return ((unsigned long)(state->back) << 16) +
263 (state->mode == COPY ? state->length :
264 (state->mode == MATCH ? state->was - state->length : 0));
265 }
266diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk misc/build/nss-3.25/nss/external_tests/common/gtest.mk
267--- misc/nss-3.25/nss/external_tests/common/gtest.mk 2017-10-09 14:16:48.000000000 -0400
268+++ misc/build/nss-3.25/nss/external_tests/common/gtest.mk 2017-10-09 14:17:55.000000000 -0400
269@@ -16,6 +16,9 @@
270 # platform.
271 ifeq (-Werror,$(filter -Werror -Wsign-compare,$(WARNING_CFLAGS)))
272 WARNING_CFLAGS += -Wsign-compare
273+ifeq (Darwin,$(OS_ARCH))
274+ WARNING_CFLAGS += -Wno-error=deprecated -Wno-error=c++11-extensions
275+endif
276 endif
277 WARNING_CFLAGS := $(filter-out -w44018,$(WARNING_CFLAGS))
278
279@@ -32,5 +35,9 @@
280 # Needed because we include files from a subdirectory
281 MAKE_OBJDIR = $(INSTALL) -D $(dir $@)
282 else
283- CXXFLAGS += -std=c++0x
284+ ifeq (Darwin,$(OS_ARCH))
285+ CXXFLAGS += -stdlib=libc++
286+ else
287+ CXXFLAGS += -std=c++0x
288+ endif
289 endif