This is an automated email from the ASF dual-hosted git repository. ardovm pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit da9e167a92556f202a7bda3927b6b34fb90d8212 Author: Don Lewis <[email protected]> AuthorDate: Tue Oct 6 09:13:42 2020 -0700 Fix nss.patch breakage which affected Darwin (cherry picked from commit 2034d94215e67ecaf0deb1d274ec4d9978fefb68) --- main/nss/nss.patch | 102 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 41 deletions(-) diff --git a/main/nss/nss.patch b/main/nss/nss.patch index e185044..a643278 100644 --- a/main/nss/nss.patch +++ b/main/nss/nss.patch @@ -1,6 +1,6 @@ diff -ur misc/nss-3.39/nspr/configure misc/build/nss-3.39/nspr/configure --- misc/nss-3.39/nspr/configure 2018-08-28 05:42:28.000000000 -0700 -+++ misc/build/nss-3.39/nspr/configure 2018-09-10 10:30:19.953743000 -0700 ++++ misc/build/nss-3.39/nspr/configure 2020-10-06 07:41:59.563345390 -0700 @@ -7039,7 +7039,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' @@ -12,7 +12,7 @@ diff -ur misc/nss-3.39/nspr/configure misc/build/nss-3.39/nspr/configure # combo is not yet good at debugging inlined diff -ur misc/nss-3.39/nspr/pr/include/pratom.h misc/build/nss-3.39/nspr/pr/include/pratom.h --- misc/nss-3.39/nspr/pr/include/pratom.h 2018-08-28 05:42:28.000000000 -0700 -+++ misc/build/nss-3.39/nspr/pr/include/pratom.h 2018-09-10 10:30:19.954252000 -0700 ++++ misc/build/nss-3.39/nspr/pr/include/pratom.h 2020-10-06 07:41:59.563345390 -0700 @@ -81,7 +81,9 @@ #if defined(_WIN32) && !defined(_WIN32_WCE) && \ (!defined(_MSC_VER) || (_MSC_VER >= 1310)) @@ -23,22 +23,9 @@ diff -ur misc/nss-3.39/nspr/pr/include/pratom.h misc/build/nss-3.39/nspr/pr/incl #ifdef _MSC_VER #pragma intrinsic(_InterlockedIncrement) -diff -ur misc/nss-3.39/nss/Makefile misc/build/nss-3.39/nss/Makefile ---- misc/nss-3.39/nss/Makefile 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/Makefile 2018-09-10 10:30:19.954774000 -0700 -@@ -77,6 +77,9 @@ - ifeq ($(OS_TARGET),WIN95) - NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 - endif -+ifdef MACOS_SDK_DIR -+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) -+endif - ifdef USE_DEBUG_RTL - NSPR_CONFIGURE_OPTS += --enable-debug-rtl - endif diff -ur misc/nss-3.39/nss/cmd/platlibs.mk misc/build/nss-3.39/nss/cmd/platlibs.mk --- misc/nss-3.39/nss/cmd/platlibs.mk 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/cmd/platlibs.mk 2018-09-10 10:30:19.955267000 -0700 ++++ misc/build/nss-3.39/nss/cmd/platlibs.mk 2020-10-06 07:41:59.567345437 -0700 @@ -10,17 +10,18 @@ ifeq ($(OS_ARCH), SunOS) @@ -64,7 +51,7 @@ diff -ur misc/nss-3.39/nss/cmd/platlibs.mk misc/build/nss-3.39/nss/cmd/platlibs. diff -ur misc/nss-3.39/nss/cmd/shlibsign/Makefile misc/build/nss-3.39/nss/cmd/shlibsign/Makefile --- misc/nss-3.39/nss/cmd/shlibsign/Makefile 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/cmd/shlibsign/Makefile 2018-09-10 10:30:19.955769000 -0700 ++++ misc/build/nss-3.39/nss/cmd/shlibsign/Makefile 2020-10-06 07:41:59.567345437 -0700 @@ -49,10 +49,15 @@ CHECKLIBS = CHECKLOC = @@ -84,10 +71,32 @@ diff -ur misc/nss-3.39/nss/cmd/shlibsign/Makefile misc/build/nss-3.39/nss/cmd/sh endif CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) -Only in misc/build/nss-3.39/nss/coreconf: Darwin.mk.rej +diff -ur misc/nss-3.39/nss/coreconf/Darwin.mk misc/build/nss-3.39/nss/coreconf/Darwin.mk +--- misc/nss-3.39/nss/coreconf/Darwin.mk 2018-08-31 05:55:53.000000000 -0700 ++++ misc/build/nss-3.39/nss/coreconf/Darwin.mk 2020-10-06 07:51:49.590356560 -0700 +@@ -3,14 +3,15 @@ + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-CC ?= gcc +-CCC ?= g++ ++# CC is taken from environment automatically. ++#CC ?= gcc ++CCC ?= $(CXX) -stdlib=libc++ -std=c++11 + RANLIB ?= ranlib + + include $(CORE_DEPTH)/coreconf/UNIX.mk +-include $(CORE_DEPTH)/coreconf/Werror.mk ++#include $(CORE_DEPTH)/coreconf/Werror.mk + +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = cc + + ifndef CPU_ARCH + # When cross-compiling, CPU_ARCH should already be defined as the target diff -ur misc/nss-3.39/nss/coreconf/FreeBSD.mk misc/build/nss-3.39/nss/coreconf/FreeBSD.mk --- misc/nss-3.39/nss/coreconf/FreeBSD.mk 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 2018-09-10 10:30:19.956982000 -0700 ++++ misc/build/nss-3.39/nss/coreconf/FreeBSD.mk 2020-10-06 07:41:59.567345437 -0700 @@ -5,9 +5,8 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -111,7 +120,7 @@ diff -ur misc/nss-3.39/nss/coreconf/FreeBSD.mk misc/build/nss-3.39/nss/coreconf/ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) diff -ur misc/nss-3.39/nss/coreconf/Linux.mk misc/build/nss-3.39/nss/coreconf/Linux.mk --- misc/nss-3.39/nss/coreconf/Linux.mk 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/coreconf/Linux.mk 2018-09-10 10:30:19.957638000 -0700 ++++ misc/build/nss-3.39/nss/coreconf/Linux.mk 2020-10-06 07:41:59.567345437 -0700 @@ -140,7 +140,7 @@ endif @@ -135,10 +144,26 @@ diff -ur misc/nss-3.39/nss/coreconf/Linux.mk misc/build/nss-3.39/nss/coreconf/Li # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. -Only in misc/build/nss-3.39/nss/coreconf: Linux.mk.rej +diff -ur misc/nss-3.39/nss/coreconf/rules.mk misc/build/nss-3.39/nss/coreconf/rules.mk +--- misc/nss-3.39/nss/coreconf/rules.mk 2018-08-31 05:55:53.000000000 -0700 ++++ misc/build/nss-3.39/nss/coreconf/rules.mk 2020-10-06 07:41:59.567345437 -0700 +@@ -322,7 +322,12 @@ + ifdef NS_USE_GCC + $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< + else +- $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< ++ #We remove stl from the paths to avoid that rc.exe finds the stlport of ++ #OOo. stlport includes the system stl which will fail. By removing it, ++ #rc will use the stl from the system if the path is in the INCLUDE ++ #variable. ++ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< ++ + endif + @echo $(RES) finished + endif diff -ur misc/nss-3.39/nss/coreconf/SunOS5.mk misc/build/nss-3.39/nss/coreconf/SunOS5.mk --- misc/nss-3.39/nss/coreconf/SunOS5.mk 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/coreconf/SunOS5.mk 2018-09-10 10:30:19.958249000 -0700 ++++ misc/build/nss-3.39/nss/coreconf/SunOS5.mk 2020-10-06 07:41:59.567345437 -0700 @@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif @@ -154,27 +179,9 @@ diff -ur misc/nss-3.39/nss/coreconf/SunOS5.mk misc/build/nss-3.39/nss/coreconf/S ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT -Only in misc/build/nss-3.39/nss/coreconf: arch.mk.rej -diff -ur misc/nss-3.39/nss/coreconf/rules.mk misc/build/nss-3.39/nss/coreconf/rules.mk ---- misc/nss-3.39/nss/coreconf/rules.mk 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/coreconf/rules.mk 2018-09-10 10:30:19.959531000 -0700 -@@ -322,7 +322,12 @@ - ifdef NS_USE_GCC - $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< - else -- $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< -+ #We remove stl from the paths to avoid that rc.exe finds the stlport of -+ #OOo. stlport includes the system stl which will fail. By removing it, -+ #rc will use the stl from the system if the path is in the INCLUDE -+ #variable. -+ INCLUDE="$(subst /stl,,$(INCLUDE))" $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< -+ - endif - @echo $(RES) finished - endif diff -ur misc/nss-3.39/nss/lib/zlib/inflate.c misc/build/nss-3.39/nss/lib/zlib/inflate.c --- misc/nss-3.39/nss/lib/zlib/inflate.c 2018-08-31 05:55:53.000000000 -0700 -+++ misc/build/nss-3.39/nss/lib/zlib/inflate.c 2018-09-10 10:30:19.960242000 -0700 ++++ misc/build/nss-3.39/nss/lib/zlib/inflate.c 2020-10-06 07:41:59.567345437 -0700 @@ -1472,9 +1472,9 @@ { struct inflate_state FAR *state; @@ -187,3 +194,16 @@ diff -ur misc/nss-3.39/nss/lib/zlib/inflate.c misc/build/nss-3.39/nss/lib/zlib/i (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } +diff -ur misc/nss-3.39/nss/Makefile misc/build/nss-3.39/nss/Makefile +--- misc/nss-3.39/nss/Makefile 2018-08-31 05:55:53.000000000 -0700 ++++ misc/build/nss-3.39/nss/Makefile 2020-10-06 07:41:59.567345437 -0700 +@@ -77,6 +77,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif
