download.lst | 4 -
external/nss/ExternalProject_nss.mk | 6 -
external/nss/UnpackedTarball_nss.mk | 1
external/nss/nsinstall.py | 7 --
external/nss/nss-3.13.5-zlib-werror.patch | 7 --
external/nss/nss-win32-make.patch.1 | 20 ------
external/nss/nss.aix.patch | 2
external/nss/nss.oldglibc.patch.1 | 97 ------------------------------
external/nss/nss.patch | 27 ++++++--
external/nss/nss.windows.patch | 4 -
10 files changed, 32 insertions(+), 143 deletions(-)
New commits:
commit e13ab2fa16d19c5aec4f846e388d91d2bd6fc01e
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:08:26 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:08:26 2020 +0200
Revert "nss: upgrade to release 3.45"
This reverts commit 92850a3628402abe36c1240b2835f1840bcff211.
diff --git a/download.lst b/download.lst
index 7400d11fe72d..6e1f0adbc6e1 100644
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97
export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2
-NSS_MD5SUM := 2f7dab8f5b85b1494f6bec2cc32a1f5c
-export NSS_TARBALL := nss-3.45-with-nspr-4.21.tar.gz
+NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
export PYTHON_TARBALL := Python-3.3.5.tgz
OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 8121658dbdd4..18985e680e92 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -153,3 +153,16 @@
#! gmake
#
# This Source Code Form is subject to the terms of the Mozilla Public
+@@ -89,10 +91,10 @@
+ NSPR_CONFIGURE_ENV = CC=gcc CXX=g++
+ endif
+ ifdef CC
+-NSPR_CONFIGURE_ENV = CC=$(CC)
++NSPR_CONFIGURE_ENV = CC="$(CC) "
+ endif
+ ifdef CCC
+-NSPR_CONFIGURE_ENV += CXX=$(CCC)
++NSPR_CONFIGURE_ENV += CXX="$(CCC) "
+ endif
+ # Remove -arch definitions. NSPR can't handle that.
+ NSPR_CONFIGURE_ENV := $(filter-out -arch x86_64,$(NSPR_CONFIGURE_ENV))
commit 3d6d8a333885b27b4367a38b7d2dfe38803ceb51
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:08:18 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:08:18 2020 +0200
Revert "NSS fix lcc support patch"
This reverts commit caa3d02a20ec369e887c828a3a37df8ed6fd7311.
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 4ea30b339b06..cf7ad65803a1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),nss/nss.windows.patch) \
- external/nss/nss.fix-freebl-add-lcc-support.patch.1 \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1
b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
deleted file mode 100644
index 3e3c06327dde..000000000000
--- a/external/nss/nss.fix-freebl-add-lcc-support.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- b/nss/lib/freebl/Makefile
-+++ a/nss/lib/freebl/Makefile
-@@ -495,7 +495,7 @@
- ifdef USE_64
- # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
- # NB: CC_NAME is not defined here
--ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc)
-+ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
- ifdef CC_IS_CLANG
- HAVE_INT128_SUPPORT = 1
- DEFINES += -DHAVE_INT128_SUPPORT
commit 51637871982e93b1a617a325c4d85112aa16fc6c
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:08:05 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:08:05 2020 +0200
Revert "nss: upgrade to release 3.47.1"
This reverts commit 0fa883069c269308482d960de5897707f22561e8.
diff --git a/download.lst b/download.lst
index b1ff3b0d9015..7400d11fe72d 100644
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97
export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2
-NSS_MD5SUM := 9bc54feb6f1e39c60932f668d3caab5e
-export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz
+NSS_MD5SUM := 2f7dab8f5b85b1494f6bec2cc32a1f5c
+export NSS_TARBALL := nss-3.45-with-nspr-4.21.tar.gz
PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
export PYTHON_TARBALL := Python-3.3.5.tgz
OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index cf7ad65803a1..4ea30b339b06 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),nss/nss.windows.patch) \
+ external/nss/nss.fix-freebl-add-lcc-support.patch.1 \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index 4b0c6bfb3261..da9aacb10e84 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -38,7 +38,7 @@ diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
--- a/a/nspr/pr/src/Makefile.in 2014-09-29 16:46:35.281395079 +0100
+++ b/b/nspr/pr/src/Makefile.in 2014-09-29 16:50:33.909375948 +0100
@@ -74,7 +74,6 @@
- endif # SunOS
+ endif
ifeq ($(OS_ARCH),AIX)
-DSO_LDOPTS += -binitfini::_PR_Fini
diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1
b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
new file mode 100644
index 000000000000..3e3c06327dde
--- /dev/null
+++ b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
@@ -0,0 +1,11 @@
+--- b/nss/lib/freebl/Makefile
++++ a/nss/lib/freebl/Makefile
+@@ -495,7 +495,7 @@
+ ifdef USE_64
+ # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
+ # NB: CC_NAME is not defined here
+-ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc)
++ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
+ ifdef CC_IS_CLANG
+ HAVE_INT128_SUPPORT = 1
+ DEFINES += -DHAVE_INT128_SUPPORT
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 53ec83cee5ce..8121658dbdd4 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -12,14 +12,14 @@
--- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:44:13.690045031
+0530
+++ b/nss/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:47:03.810814019 +0530
@@ -438,7 +438,7 @@
- char *buf = *bufp;
- PRIntn buflen = *buflenp;
+ char *buf = *bufp;
+ PRIntn buflen = *buflenp;
-- if (align && ((long)buf & (align - 1))) {
-+ if (align && ((ptrdiff_t)buf & (align - 1))) {
- PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
- if (buflen < skip) {
- return 0;
+- if (align && ((long)buf & (align - 1))) {
++ if (align && ((ptrdiff_t)buf & (align - 1))) {
+ PRIntn skip = align - ((ptrdiff_t)buf & (align - 1));
+ if (buflen < skip) {
+ return 0;
--- a/a/nss/cmd/platlibs.mk 2017-08-29 23:44:13.554044416 +0530
+++ b/b/nss/cmd/platlibs.mk 2017-08-29 23:46:09.638569150 +0530
@@ -10,17 +10,22 @@
commit 7e52a032f53ff918e0da95155fa8c76fad93ff18
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:07:57 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:07:57 2020 +0200
Revert "NSS: enable parallel build"
This reverts commit 85a59a30359cd454830b3403f8dcdc01584f3e13.
diff --git a/download.lst b/download.lst
index 8fabf31ef11a..b1ff3b0d9015 100644
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97
export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2
-NSS_MD5SUM := 22fa83bfedda5fde047a714d8a4d8968
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+NSS_MD5SUM := 9bc54feb6f1e39c60932f668d3caab5e
+export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz
PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
export PYTHON_TARBALL := Python-3.3.5.tgz
OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
diff --git a/external/nss/ExternalProject_nss.mk
b/external/nss/ExternalProject_nss.mk
index 18b07d63c6c4..46e0cf218546 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -30,11 +30,11 @@ $(call gb_ExternalProject_get_state_target,nss,build):
$(call gb_ExternalProject
$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
NSS_DISABLE_GTESTS=1 \
NSS_ENABLE_WERROR=0 \
- OS_TARGET=WIN95 \
+ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="$(SOLARINC)" \
- $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
+ $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
,nss)
@@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call
gb_ExternalProject
$(if $(filter YES,$(CROSS_COMPILING)),\
NSINSTALL="$(call gb_ExternalExecutable_get_command,python)
$(SRCDIR)/external/nss/nsinstall.py") \
NSDISTMODE=copy \
- $(MAKE) AR=$(AR) RANLIB=$(RANLIB) CCC="$(CXX)" NMEDIT=$(NM)edit
nss_build_all \
+ $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) CCC="$(CXX)"
NMEDIT=$(NM)edit nss_build_all \
&& rm -f $(call
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
&& chmod u+w $(call
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index db6bdd4640c8..cf7ad65803a1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
external/nss/nss-winXP-sdk.patch.1) \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss-no-c99.patch) \
- external/nss/nss.nspr-parallel-win-debug_build.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/nsinstall.py b/external/nss/nsinstall.py
index 80e9c1679373..31b3de3450c5 100644
--- a/external/nss/nsinstall.py
+++ b/external/nss/nsinstall.py
@@ -155,12 +155,7 @@ def nsinstall(argv):
target = args.pop()
# ensure target directory
if not os.path.isdir(target):
- try:
- os.makedirs(target)
- except FileExistsError:
- if not os.path.isdir(target):
- sys.stderr.write('nsinstall: ' + target + ' is not a directoy!\n')
- return 1
+ os.makedirs(target)
copy_all_entries(args, target)
return 0
diff --git a/external/nss/nss-3.13.5-zlib-werror.patch
b/external/nss/nss-3.13.5-zlib-werror.patch
index 0cdbf7808f81..6cda50023f1b 100644
--- a/external/nss/nss-3.13.5-zlib-werror.patch
+++ b/external/nss/nss-3.13.5-zlib-werror.patch
@@ -1,10 +1,9 @@
--- a/a/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200
+++ b/b/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200
-@@ -26,6 +26,10 @@
- # define write _write
- # define close _close
+@@ -26,6 +26,9 @@
+ # include <limits.h>
#endif
-+
+ #include <fcntl.h>
+#ifndef _WIN32
+#include <unistd.h>
+#endif
diff --git a/external/nss/nss-win32-make.patch.1
b/external/nss/nss-win32-make.patch.1
deleted file mode 100644
index 7ba3df451ee6..000000000000
--- a/external/nss/nss-win32-make.patch.1
+++ /dev/null
@@ -1,20 +0,0 @@
---- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200
-+++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200
-@@ -259,7 +259,7 @@
- $(LIBRARY): $(OBJS) | $$(@D)/d
- rm -f $@
- ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
-- $(AR) $(subst /,\\,$(OBJS))
-+ $(AR) $(OBJS)
- else
- $(AR) cr $@ $(OBJS)
- endif
-@@ -297,7 +297,7 @@
- ifdef NS_USE_GCC
- $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
$(OS_LIBS) $(LD_LIBS) $(RES)
- else
-- $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS)
$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES))
-+ $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS)
$(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
- ifdef MT
- if test -f $@.manifest; then \
- $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch
b/external/nss/nss.nspr-parallel-win-debug_build.patch
deleted file mode 100644
index 86b55e1ccf7f..000000000000
--- a/external/nss/nss.nspr-parallel-win-debug_build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Änderung: 4866:23940b78e965
-Nutzer: Jan-Marek Glogowski <glo...@fbihome.de>
-Datum: Fri May 01 22:50:55 2020 +0000
-Dateien: pr/tests/Makefile.in
-Beschreibung:
-Bug 290526 Write separate PDBs for test OBJs r=glandium
-
-Quite often when running a parallel NSS build, I get the following
-compiler error message, resulting in a build failure, despite
-compiling with the -FS flag:
-
-.../nss/nspr/pr/tests/zerolen.c: fatal error C1041:
-Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht
-ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in
-dieselbe .PDB-Datei schreiben.
-
-The failing source file is always one of the last test object
-files. But the actual problem is not the compiler accessing the
-PDB file, but the linker already linking the first test
-executables accessing the shared PDB; at least that's my guess.
-
-So instead of using a shared PDB for all test object files, this
-uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every
-test's object file. The linker works fine with the shared OBJ PDB.
-
-Differential Revision: https://phabricator.services.mozilla.com/D68693
-
-
-diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in
---- a/nss/nspr/pr/tests/Makefile.in Mon Feb 10 20:58:42 2020 +0000
-+++ b/nss/nspr/pr/tests/Makefile.in Fri May 01 22:50:55 2020 +0000
-@@ -211,6 +211,7 @@
- else
- EXTRA_LIBS += ws2_32.lib
- LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
-+ CFLAGS += -Fd$(@:.$(OBJ_SUFFIX)=.pdb)
- ifdef PROFILE
- LDOPTS += -PROFILE -MAP
- endif # profile
-
diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch
index 901846e7bc1f..9dbeaa946520 100644
--- a/external/nss/nss.windows.patch
+++ b/external/nss/nss.windows.patch
@@ -18,8 +18,8 @@
-core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter
/%,$(1)),$(1),$(PWD)/$(1)))'
+core_abspath = '$(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(shell
cygpath -m $(1))),$(1),$(shell cygpath -m $(PWD)/$(1))))'
- $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c | $$(@D)/d
- ifdef USE_NT_C_SYNTAX
+ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
+ @$(MAKE_OBJDIR)
--- a/a/nspr/pr/include/md/_win95.h
+++ b/b/nspr/pr/include/md/_win95.h
@@ -312,7 +312,7 @@
commit ac516cb4c84d4af702192905f93d26d4225870d5
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:07:30 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:07:30 2020 +0200
Revert "nss: upgrade to release 3.55.0"
This reverts commit 7fc932945585f11dc766d0d8610f286b39fce2d2.
diff --git a/download.lst b/download.lst
index 3bb30b3e52f5..8fabf31ef11a 100644
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97
export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2
-NSS_MD5SUM := d18bfd181e345cd07c0213d62bdf9ad7
-export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
+NSS_MD5SUM := 22fa83bfedda5fde047a714d8a4d8968
+export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
export PYTHON_TARBALL := Python-3.3.5.tgz
OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index cf7ad65803a1..db6bdd4640c8 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
external/nss/nss-winXP-sdk.patch.1) \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss-no-c99.patch) \
+ external/nss/nss.nspr-parallel-win-debug_build.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch
b/external/nss/nss.nspr-parallel-win-debug_build.patch
new file mode 100644
index 000000000000..86b55e1ccf7f
--- /dev/null
+++ b/external/nss/nss.nspr-parallel-win-debug_build.patch
@@ -0,0 +1,40 @@
+Änderung: 4866:23940b78e965
+Nutzer: Jan-Marek Glogowski <glo...@fbihome.de>
+Datum: Fri May 01 22:50:55 2020 +0000
+Dateien: pr/tests/Makefile.in
+Beschreibung:
+Bug 290526 Write separate PDBs for test OBJs r=glandium
+
+Quite often when running a parallel NSS build, I get the following
+compiler error message, resulting in a build failure, despite
+compiling with the -FS flag:
+
+.../nss/nspr/pr/tests/zerolen.c: fatal error C1041:
+Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht
+ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in
+dieselbe .PDB-Datei schreiben.
+
+The failing source file is always one of the last test object
+files. But the actual problem is not the compiler accessing the
+PDB file, but the linker already linking the first test
+executables accessing the shared PDB; at least that's my guess.
+
+So instead of using a shared PDB for all test object files, this
+uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every
+test's object file. The linker works fine with the shared OBJ PDB.
+
+Differential Revision: https://phabricator.services.mozilla.com/D68693
+
+
+diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in
+--- a/nss/nspr/pr/tests/Makefile.in Mon Feb 10 20:58:42 2020 +0000
++++ b/nss/nspr/pr/tests/Makefile.in Fri May 01 22:50:55 2020 +0000
+@@ -211,6 +211,7 @@
+ else
+ EXTRA_LIBS += ws2_32.lib
+ LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
++ CFLAGS += -Fd$(@:.$(OBJ_SUFFIX)=.pdb)
+ ifdef PROFILE
+ LDOPTS += -PROFILE -MAP
+ endif # profile
+
commit bbaddb619aec761d74e88857c31d3efef24d61cf
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Thu Oct 8 15:07:20 2020 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Oct 8 15:07:20 2020 +0200
Revert "Fix nss build on centos 5 baseline"
This reverts commit 2c4e4dbc6a2cfecd19d683d445cb163da09bf290.
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 047ee11c8377..cf7ad65803a1 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
external/nss/nss-winXP-sdk.patch.1) \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss-no-c99.patch) \
- external/nss/nss.oldglibc.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/nss.oldglibc.patch.1
b/external/nss/nss.oldglibc.patch.1
deleted file mode 100644
index 7c78f6356dc1..000000000000
--- a/external/nss/nss.oldglibc.patch.1
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ur
nss.org/nss/lib/freebl/verified/kremlin/include/kremlin/lowstar_endianness.h
nss/nss/lib/freebl/verified/kremlin/include/kremlin/lowstar_endianness.h
----
nss.org/nss/lib/freebl/verified/kremlin/include/kremlin/lowstar_endianness.h
2020-10-08 08:38:04.319549594 +0200
-+++ nss/nss/lib/freebl/verified/kremlin/include/kremlin/lowstar_endianness.h
2020-10-08 08:38:56.872385737 +0200
-@@ -198,6 +198,93 @@
- memcpy(b, &i, 8);
- }
-
-+
-+#if !defined(__bswap_constant_64)
-+
-+static __inline __uint16_t
-+__uint16_identity (__uint16_t __x)
-+{
-+ return __x;
-+}
-+
-+static __inline __uint32_t
-+__uint32_identity (__uint32_t __x)
-+{
-+ return __x;
-+}
-+
-+static __inline __uint64_t
-+__uint64_identity (__uint64_t __x)
-+{
-+ return __x;
-+}
-+
-+/* Swap bytes in 16-bit value. */
-+#define __bswap_constant_16(x) \
-+ ((__uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
-+
-+static __inline __uint16_t
-+__bswap_16 (__uint16_t __bsx)
-+{
-+#if __GNUC_PREREQ (4, 8)
-+ return __builtin_bswap16 (__bsx);
-+#else
-+ return __bswap_constant_16 (__bsx);
-+#endif
-+}
-+
-+/* Swap bytes in 32-bit value. */
-+#define __bswap_constant_32(x) \
-+ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) \
-+ | (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24))
-+
-+static __inline __uint32_t
-+__bswap_32 (__uint32_t __bsx)
-+{
-+#if __GNUC_PREREQ (4, 3)
-+ return __builtin_bswap32 (__bsx);
-+#else
-+ return __bswap_constant_32 (__bsx);
-+#endif
-+}
-+
-+/* Swap bytes in 64-bit value. */
-+#define __bswap_constant_64(x) \
-+ ((((x) & 0xff00000000000000ull) >> 56) \
-+ | (((x) & 0x00ff000000000000ull) >> 40) \
-+ | (((x) & 0x0000ff0000000000ull) >> 24) \
-+ | (((x) & 0x000000ff00000000ull) >> 8) \
-+ | (((x) & 0x00000000ff000000ull) << 8) \
-+ | (((x) & 0x0000000000ff0000ull) << 24) \
-+ | (((x) & 0x000000000000ff00ull) << 40) \
-+ | (((x) & 0x00000000000000ffull) << 56))
-+
-+__extension__ static __inline __uint64_t
-+__bswap_64 (__uint64_t __bsx)
-+{
-+#if __GNUC_PREREQ (4, 3)
-+ return __builtin_bswap64 (__bsx);
-+#else
-+ return __bswap_constant_64 (__bsx);
-+#endif
-+}
-+# define htobe16(x) __bswap_16 (x)
-+# define htole16(x) __uint16_identity (x)
-+# define be16toh(x) __bswap_16 (x)
-+# define le16toh(x) __uint16_identity (x)
-+
-+# define htobe32(x) __bswap_32 (x)
-+# define htole32(x) __uint32_identity (x)
-+# define be32toh(x) __bswap_32 (x)
-+# define le32toh(x) __uint32_identity (x)
-+
-+# define htobe64(x) __bswap_64 (x)
-+# define htole64(x) __uint64_identity (x)
-+# define be64toh(x) __bswap_64 (x)
-+# define le64toh(x) __uint64_identity (x)
-+
-+#endif // !defined(__bswap_constant_64)
-+
- /* Legacy accessors so that this header can serve as an implementation of
- * C.Endianness */
- #define load16_le(b) (le16toh(load16(b)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
