download.lst | 4 ++-- external/nss/ExternalProject_nss.mk | 7 ++----- external/nss/UnpackedTarball_nss.mk | 1 - external/nss/connectx.patch.0 | 11 ----------- external/nss/nss_macosx.patch | 23 ++++++++++++----------- 5 files changed, 16 insertions(+), 30 deletions(-)
New commits: commit 85ee5ef7be3b5fbdf8605ca0248179630e6018b6 Author: Christian Lohmaier <[email protected]> AuthorDate: Thu Dec 11 10:57:57 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:51 2026 +0100 fix nss/nspr build on intel macs regression from aba5f8016965e42075e68faa17ddfd3b3213247d nss' Darwin.mk uses uname -p to decide on the platform if CPU_ARCH is not set, and that still returns i386 on intel macs – in the old version that still worked since there was an additional ifdef USE_64 check that then set it to x86_64, but that has since been removed and only the custom guards to not add additional -arch parameter to the compiler flags remain, resulting in the built to attempt a 32bit and that then fails when it comes to the assembly instructions: mpi/mpi_sse2.s:35:5: error: instruction requires: Not 64-bit mode push %ebp ^ mpi/mpi_sse2.s:37:5: error: instruction requires: Not 64-bit mode push %edi ^ mpi/mpi_sse2.s:38:5: error: instruction requires: Not 64-bit mode push %esi ^ […] So don't rely on auto-detection and specify it explicitly as it was done for the other variants already, ironically also already for building for intel on arm. But the additional check whether it is building on arm is not necessary, our CPUNAME is sufficient already and that now superfluous bit can be removed. Change-Id: Ic467b06beb9b73e2d177eedede886681aa668b15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195439 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Reviewed-by: Dan Williams <[email protected]> (cherry picked from commit e11962c57a1a955f1509a653deea352583f3f77e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195490 Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit d5071c1e46da4d85085e423d104a11dbbf485d5d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200803 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 3a9715862abe..cd198051c017 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -55,7 +55,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(SRCDIR)/external/nss/nsinstall.py $(call gb_Trace_StartRange,nss,EXTERNAL) $(call gb_ExternalProject_run,build,\ - $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ + $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1 CPU_ARCH=x86_64)) \ $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ $(if $(filter POWERPC64,$(CPUNAME)),USE_64=1 CPU_ARCH=ppc64le) \ $(if $(filter MACOSX,$(OS)),\ @@ -66,8 +66,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ - $(if $(filter MACOSX-X86_64-arm64,$(OS)-$(CPUNAME)-$(shell uname -m)), \ - CPU_ARCH=x86_64) \ NSDISTMODE=copy \ $(MAKE) \ AR="$(AR)" \ commit e584e17b709bc5c30d53b4eaee67839ff5532d42 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Dec 5 14:20:42 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:45 2026 +0100 nss: upgrade to 3.119 * external/nss/connectx.patch.0 has been fixed upstream Downloaded from https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_RTM/src/nss-3.119-with-nspr-4.38.2.tar.gz Change-Id: I0477965c9ab62f21684278e5ed7860360521b270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195081 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit aba5f8016965e42075e68faa17ddfd3b3213247d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195312 (cherry picked from commit fb22ad4fa2b3adc6b8502e6e22e6032a2075df21) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200802 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/download.lst b/download.lst index 39379ecb38db..4d26d3989e48 100644 --- a/download.lst +++ b/download.lst @@ -580,8 +580,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -NSS_SHA256SUM := 9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15 -NSS_TARBALL := nss-3.118.1-with-nspr-4.37.tar.gz +NSS_SHA256SUM := 8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3 +NSS_TARBALL := nss-3.119-with-nspr-4.38.2.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index a1e47c307a96..5915af095a54 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-restore-manual-pre-dependencies.patch.1 \ external/nss/Wincompatible-function-pointer-types.patch.0 \ external/nss/nspr-win95-target.patch \ - external/nss/connectx.patch.0 \ $(if $(filter LINUX,$(OS)), \ external/nss/nss.disablefsync.patch \ external/nss/nss.getrandom.patch) \ diff --git a/external/nss/connectx.patch.0 b/external/nss/connectx.patch.0 deleted file mode 100644 index 29c6fd1a8469..000000000000 --- a/external/nss/connectx.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- nspr/pr/src/pthreads/ptio.c -+++ nspr/pr/src/pthreads/ptio.c -@@ -1989,7 +1989,7 @@ - PRIntn flags, const PRNetAddr* addr, - PRIntervalTime timeout) { - # if defined(LINUX) || HAS_CONNECTX -- PRInt32 syserrno, bytes = -1; -+ PRInt32 syserrno; ssize_t bytes = -1; - PRBool fNeedContinue = PR_FALSE; - pt_SockLen addr_len; - const PRNetAddr* addrp = addr; diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 13cf0cda706b..eaa025f1c205 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -23,32 +23,33 @@ diff -ru a/nspr/configure b/nspr/configure diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 -@@ -20,13 +20,17 @@ +@@ -19,34 +19,39 @@ + endif - ifeq (,$(filter-out i%86,$(CPU_ARCH))) - ifdef USE_64 + ifeq (x86_64,$(CPU_ARCH)) +ifeq (,$(findstring -arch ,$(CC))) CC += -arch x86_64 CCC += -arch x86_64 +endif override CPU_ARCH = x86_64 - else + else ifeq (i386,$(CPU_ARCH)) OS_REL_CFLAGS = -Di386 +ifeq (,$(findstring -arch ,$(CC))) CC += -arch i386 CCC += -arch i386 +endif override CPU_ARCH = x86 - endif - else -@@ -33,19 +37,20 @@ - ifeq (arm,$(CPU_ARCH)) - # Nothing set for arm currently. - else + else ifeq (,$(filter-out aarch64 arm,$(CPU_ARCH))) + CC += -arch arm64 + CCC += -arch arm64 + override CPU_ARCH = aarch64 + else ifeq (powerpc,$(CPU_ARCH)) -OS_REL_CFLAGS = -Dppc -CC += -arch ppc -CCC += -arch ppc - endif + override CPU_ARCH = ppc + else + $(error Unknown CPU architecture) endif ifneq (,$(MACOS_SDK_DIR)) commit 702fa3dfdb45a4bfda3940c55c6d66d4257b2431 Author: Michael Stahl <[email protected]> AuthorDate: Wed Dec 3 18:03:16 2025 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Mar 2 14:35:38 2026 +0100 nss: try to fix Windows ARM64 build Reportedly it breaks if CC is set to anything sensible, let's just leave it alone... also it turns out that the newer nss version builds with CC containing an argument in config_host.mk anyway. Change-Id: Ifecc68ffe582790134f91cbef459e2728d9202c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194963 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Jenkins (cherry picked from commit bb77fdf427b0ee4171076a143e58cfbbc360f80a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200801 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index bc0b18f7fc39..3a9715862abe 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -43,8 +43,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \ - CC="$(patsubst %,\"%\",$(CC))" \ - CCC="$(patsubst %,\"%\",$(CXX))" \ + CCC="$(CXX)" \ ,nss) $(call gb_Trace_EndRange,nss,EXTERNAL)
