| nss.patch (f1341198) | nss.patch (94670cb6) |
|---|---|
| 1diff -ur misc/nss-3.39/nspr/configure misc/build/nss-3.39/nspr/configure 2--- misc/nss-3.39/nspr/configure 2018-08-28 05:42:28.000000000 -0700 3+++ misc/build/nss-3.39/nspr/configure 2020-10-06 07:41:59.563345390 -0700 4@@ -7039,7 +7039,7 @@ 5 PR_MD_CSRCS=linux.c 6 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' 7 DSO_CFLAGS=-fPIC 8- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' --- 57 unchanged lines hidden (view full) --- 66+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) 67+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) 68 ifndef NSS_DISABLE_DBM 69-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 70+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 71 endif 72 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) 73 | 1diff -ur misc/nss-3.39/nspr/configure misc/build/nss-3.39/nspr/configure 2--- misc/nss-3.39/nspr/configure 2018-08-28 05:42:28.000000000 -0700 3+++ misc/build/nss-3.39/nspr/configure 2020-10-06 07:41:59.563345390 -0700 4@@ -7039,7 +7039,7 @@ 5 PR_MD_CSRCS=linux.c 6 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' 7 DSO_CFLAGS=-fPIC 8- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' --- 57 unchanged lines hidden (view full) --- 66+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) 67+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) 68 ifndef NSS_DISABLE_DBM 69-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 70+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) 71 endif 72 CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) 73 |
| 74diff -ur misc/nss-3.39/nss/coreconf/Darwin.mk misc/build/nss-3.39/nss/coreconf/Darwin.mk 75--- misc/nss-3.39/nss/coreconf/Darwin.mk 2018-08-31 05:55:53.000000000 -0700 76+++ misc/build/nss-3.39/nss/coreconf/Darwin.mk 2020-10-06 07:51:49.590356560 -0700 77@@ -3,14 +3,15 @@ 78 # License, v. 2.0. If a copy of the MPL was not distributed with this 79 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 80 81-CC ?= gcc 82-CCC ?= g++ 83+# CC is taken from environment automatically. 84+#CC ?= gcc 85+CCC ?= $(CXX) -stdlib=libc++ -std=c++11 86 RANLIB ?= ranlib 87 88 include $(CORE_DEPTH)/coreconf/UNIX.mk 89-include $(CORE_DEPTH)/coreconf/Werror.mk 90+#include $(CORE_DEPTH)/coreconf/Werror.mk 91 92-DEFAULT_COMPILER = gcc 93+DEFAULT_COMPILER = cc 94 95 ifndef CPU_ARCH 96 # When cross-compiling, CPU_ARCH should already be defined as the target | |
| 97diff -ur misc/nss-3.39/nss/coreconf/FreeBSD.mk misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 98--- misc/nss-3.39/nss/coreconf/FreeBSD.mk 2018-08-31 05:55:53.000000000 -0700 99+++ misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 2020-10-06 07:41:59.567345437 -0700 100@@ -5,9 +5,8 @@ 101 102 include $(CORE_DEPTH)/coreconf/UNIX.mk 103 104-DEFAULT_COMPILER = gcc --- 105 unchanged lines hidden --- | 74diff -ur misc/nss-3.39/nss/coreconf/FreeBSD.mk misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 75--- misc/nss-3.39/nss/coreconf/FreeBSD.mk 2018-08-31 05:55:53.000000000 -0700 76+++ misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 2020-10-06 07:41:59.567345437 -0700 77@@ -5,9 +5,8 @@ 78 79 include $(CORE_DEPTH)/coreconf/UNIX.mk 80 81-DEFAULT_COMPILER = gcc --- 105 unchanged lines hidden --- |