Author: jim
Date: Mon Oct 9 19:36:22 2017
New Revision: 1811598
URL: http://svn.apache.org/viewvc?rev=1811598&view=rev
Log:
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.
Modified:
openoffice/trunk/main/nss/nss.patch
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
Modified: openoffice/trunk/main/nss/nss.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss.patch?rev=1811598&r1=1811597&r2=1811598&view=diff
==============================================================================
--- openoffice/trunk/main/nss/nss.patch (original)
+++ openoffice/trunk/main/nss/nss.patch Mon Oct 9 19:36:22 2017
@@ -104,16 +104,19 @@ diff -ur misc/nss-3.25/nss/cmd/shlibsign
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/infl
(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
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1811598&r1=1811597&r2=1811598&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Mon Oct 9 19:36:22
2017
@@ -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 := \
