You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2022/01/31 20:39:44 UTC
[openoffice] branch AOO41X updated: Fix compilation on macOS Catalina
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 94670cb Fix compilation on macOS Catalina
94670cb is described below
commit 94670cb6fc609a847c86ebcb50f20c508db6b744
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Jan 7 10:26:25 2022 +0100
Fix compilation on macOS Catalina
---
main/nss/nss.patch | 23 -----------------------
main/nss/nss_macosx.patch | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/main/nss/nss.patch b/main/nss/nss.patch
index a643278..529b033 100644
--- a/main/nss/nss.patch
+++ b/main/nss/nss.patch
@@ -71,29 +71,6 @@ diff -ur misc/nss-3.39/nss/cmd/shlibsign/Makefile misc/build/nss-3.39/nss/cmd/sh
endif
CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk)
-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 2020-10-06 07:41:59.567345437 -0700
diff --git a/main/nss/nss_macosx.patch b/main/nss/nss_macosx.patch
index 8592113..c4e76ed 100644
--- a/main/nss/nss_macosx.patch
+++ b/main/nss/nss_macosx.patch
@@ -14,3 +14,33 @@ diff -ur misc/nss-3.39/nss/lib/sqlite/config.mk misc/build/nss-3.39/nss/lib/sqli
OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
endif
endif # Darwin
+--- misc/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:04.000000000 -0400
++++ misc/build/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:11.000000000 -0400
+@@ -63,4 +63,4 @@
+ if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
+ endef
+
+-include $(CORE_DEPTH)/coreconf/Werror.mk
++#include $(CORE_DEPTH)/coreconf/Werror.mk
+--- misc/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:22.000000000 -0400
++++ misc/build/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:30.000000000 -0400
+@@ -8,6 +8,9 @@
+ RANLIB ?= ranlib
+
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+-include $(CORE_DEPTH)/coreconf/Werror.mk
++#include $(CORE_DEPTH)/coreconf/Werror.mk
++
++CXXFLAGS += -stdlib=libc++
++LDFLAGS += -stdlib=libc++
+
+ DEFAULT_COMPILER = gcc
+@@ -108,7 +111,7 @@
+ # May override this with different compatibility and current version numbers.
+ DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
+ # May override this with -bundle to create a loadable module.
+-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
++DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -stdlib=libc++
+
+ ifdef USE_GCOV
+ OS_CFLAGS += --coverage