[openoffice] branch trunk updated: When building on later Xcodes and when the target != the latest, we get this stupid error about weaks

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 02bc992  When building on later Xcodes and when the target != the latest, we get this stupid error about weaks
02bc992 is described below

commit 02bc9921db54575f459f1b8b4059109c35163353
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon Feb 1 13:23:23 2021 -0500

    When building on later Xcodes and when the target != the latest, we get this stupid error about weaks
---
 main/redland/raptor/makefile.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main/redland/raptor/makefile.mk b/main/redland/raptor/makefile.mk
index acb8bfa..c7a4f7d 100644
--- a/main/redland/raptor/makefile.mk
+++ b/main/redland/raptor/makefile.mk
@@ -101,6 +101,13 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF                  # "$(OS)$(COM)"=="SOLARISC52"
 
+# Apple added availability annotiations to __darwin_check_fd_set_overflow to avoid the use of weak
+# and building with older deployment target fundamentally requires weak imports
+# Grrrrrr
+.IF "$(OS)"=="MACOSX"
+LDFLAGS+:=-Wl,-U,___darwin_check_fd_set_overflow
+.ENDIF                  #
+
 .IF "$(COM)"=="C52" && "$(CPU)"=="U"
 CFLAGS=-m64
 .EXPORT: CFLAGS