nss/nss.patch | 33 ++++++++++++++++++++++++++++++--- solenv/gbuild/platform/macosx.mk | 4 ++-- 2 files changed, 32 insertions(+), 5 deletions(-)
New commits: commit 97bf734e89eb17f0c35f96466e437d5b53960229 Author: Jim Jagielski <[email protected]> Date: Mon Oct 9 19:36:22 2017 +0000 More hoo-haa trying to get NSS to compile under macOS with 10.7 as the target. Moving to 10.9 most likely is the better fix, but that means AOO 4.2.0 will no longer support anything older than Mavericks. Which I don't think we want to do. diff --git a/nss/nss.patch b/nss/nss.patch index 5caa67b34484..17ca773ac9b3 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -104,16 +104,19 @@ diff -ur misc/nss-3.25/nss/cmd/shlibsign/Makefile misc/build/nss-3.25/nss/cmd/sh diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk misc/build/nss-3.25/nss/coreconf/Darwin.mk --- misc/nss-3.25/nss/coreconf/Darwin.mk 2016-06-20 10:11:28.000000000 -0700 +++ misc/build/nss-3.25/nss/coreconf/Darwin.mk 2016-07-14 23:47:54.560325000 -0700 -@@ -6,10 +6,12 @@ +@@ -4,12 +4,14 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + include $(CORE_DEPTH)/coreconf/UNIX.mk - include $(CORE_DEPTH)/coreconf/Werror.mk +-include $(CORE_DEPTH)/coreconf/Werror.mk ++#include $(CORE_DEPTH)/coreconf/Werror.mk -DEFAULT_COMPILER = gcc +DEFAULT_COMPILER = cc + +# CC is taken from environment automatically. +#CC = cc -+CCC = $(CXX) ++CCC = $(CXX) -stdlib=libc++ -CC = gcc -CCC = g++ @@ -260,3 +263,27 @@ diff -ur misc/nss-3.25/nss/lib/zlib/inflate.c misc/build/nss-3.25/nss/lib/zlib/i (state->mode == COPY ? state->length : (state->mode == MATCH ? state->was - state->length : 0)); } +diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk misc/build/nss-3.25/nss/external_tests/common/gtest.mk +--- misc/nss-3.25/nss/external_tests/common/gtest.mk 2017-10-09 14:16:48.000000000 -0400 ++++ misc/build/nss-3.25/nss/external_tests/common/gtest.mk 2017-10-09 14:17:55.000000000 -0400 +@@ -16,6 +16,9 @@ + # platform. + ifeq (-Werror,$(filter -Werror -Wsign-compare,$(WARNING_CFLAGS))) + WARNING_CFLAGS += -Wsign-compare ++ifeq (Darwin,$(OS_ARCH)) ++ WARNING_CFLAGS += -Wno-error=deprecated -Wno-error=c++11-extensions ++endif + endif + WARNING_CFLAGS := $(filter-out -w44018,$(WARNING_CFLAGS)) + +@@ -32,5 +35,9 @@ + # Needed because we include files from a subdirectory + MAKE_OBJDIR = $(INSTALL) -D $(dir $@) + else +- CXXFLAGS += -std=c++0x ++ ifeq (Darwin,$(OS_ARCH)) ++ CXXFLAGS += -stdlib=libc++ ++ else ++ CXXFLAGS += -std=c++0x ++ endif + endif diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 6ad09990a5cc..ba286760ef14 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -116,8 +116,8 @@ ifneq ($(MACOSX_DEPLOYMENT_TARGET),) endif ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE) -gb_CFLAGS_WERROR := -Werror -gb_CXXFLAGS_WERROR := -Werror +gb_CFLAGS_WERROR := -Werror -Wno-error=deprecated +gb_CXXFLAGS_WERROR := -Werror -Wno-error=deprecated endif gb_LinkTarget_EXCEPTIONFLAGS := \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
