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 aff3bb2 Up Merge branch 'AOO42X' of
https://gitbox.apache.org/repos/asf/openoffice into AOO42X
aff3bb2 is described below
commit aff3bb25c3d3591c9e34ef04c5eb1043ee55d311
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Fri Dec 18 14:20:35 2020 -0500
Up
Merge branch 'AOO42X' of https://gitbox.apache.org/repos/asf/openoffice
into AOO42X
(cherry picked from commit 3eac5e1a06ced5fbc1bce9fa16090e1d47c1b67e)
---
main/cppuhelper/Library_cppuhelper.mk | 2 ++
main/cppuhelper/source/makefile.mk | 2 ++
main/jvmaccess/Library_jvmaccess.mk | 2 ++
main/odk/util/odk_rules.pmk | 5 +----
main/salhelper/Library_salhelper.mk | 2 ++
main/salhelper/source/makefile.mk | 2 +-
main/solenv/inc/_tg_shl.mk | 20 ++++++++++----------
main/solenv/inc/tg_shl.mk | 2 +-
8 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/main/cppuhelper/Library_cppuhelper.mk
b/main/cppuhelper/Library_cppuhelper.mk
index e82d413..2397375 100644
--- a/main/cppuhelper/Library_cppuhelper.mk
+++ b/main/cppuhelper/Library_cppuhelper.mk
@@ -34,8 +34,10 @@ $(eval $(call
gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/c
else ifeq ($(GUI)$(COMNAME),OS2gcc3)
$(eval $(call
gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3os2.map))
else
+ifneq ($(OS),MACOSX)
$(eval $(call
gb_Library_set_versionmap,cppuhelper,$(SRCDIR)/cppuhelper/source/gcc3.map))
endif
+endif
$(eval $(call gb_Library_set_include,cppuhelper,\
diff --git a/main/cppuhelper/source/makefile.mk
b/main/cppuhelper/source/makefile.mk
index c9ac9d4..e552dc8 100644
--- a/main/cppuhelper/source/makefile.mk
+++ b/main/cppuhelper/source/makefile.mk
@@ -182,8 +182,10 @@ SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(GUI)$(COMNAME)"=="OS2gcc3"
SHL1VERSIONMAP=gcc3os2.map
.ELSE
+.IF "$(OS)" != "MACOSX"
SHL1VERSIONMAP=gcc3.map
.ENDIF
+.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/main/jvmaccess/Library_jvmaccess.mk
b/main/jvmaccess/Library_jvmaccess.mk
index 24c1375..45f8f6b 100644
--- a/main/jvmaccess/Library_jvmaccess.mk
+++ b/main/jvmaccess/Library_jvmaccess.mk
@@ -30,8 +30,10 @@ $(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/cc5_s
else ifeq ($(GUI)$(COM),WNTGCC)
$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/mingw.map))
else ifeq ($(COMNAME),gcc3)
+ifneq ($(OS),MACOSX)
$(eval $(call
gb_Library_set_versionmap,jvmaccess,$(SRCDIR)/jvmaccess/util/gcc3.map))
endif
+endif
$(eval $(call gb_Library_set_include,jvmaccess,\
$$(INCLUDE) \
diff --git a/main/odk/util/odk_rules.pmk b/main/odk/util/odk_rules.pmk
index 6e5af15..8fc506e 100644
--- a/main/odk/util/odk_rules.pmk
+++ b/main/odk/util/odk_rules.pmk
@@ -166,11 +166,8 @@ $(DESTDIRSETTINGS)/component.uno.def :
$(PRJ)/settings/component.uno.def
$(DESTDIRSETTINGS)/component.uno.map : $(SOLARENV)/bin/addsym.awk
$(SOLARENV)/src/component.map
@@-$(RM) -f $@
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
tr -d "\015" < $(SOLARENV)/src/component.map | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
-.IF "$(OS)"=="MACOSX"
- tr -d "\015" < $(SOLARENV)/src/component.map | tail -n +3 | head -3 |
sed -e 's/.*component/_component/g' -e 's/;[ ]*//' > $@
-.ENDIF
.ELSE # "$(COMID)"=="gcc3"
tr -d "\015" < $(SOLARENV)/src/component.map > $@
.ENDIF # "$(COMID)"=="gcc3"
diff --git a/main/salhelper/Library_salhelper.mk
b/main/salhelper/Library_salhelper.mk
index eb636f0..8b2ac7d 100644
--- a/main/salhelper/Library_salhelper.mk
+++ b/main/salhelper/Library_salhelper.mk
@@ -48,8 +48,10 @@ $(eval $(call
gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/gcc
else ifeq ($(COMNAME),sunpro5)
$(eval $(call
gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/sols.map))
else ifeq ($(COMNAME),gcc3)
+ifneq ($(OS),MACOSX)
$(eval $(call
gb_Library_set_versionmap,salhelper,$(SRCDIR)/salhelper/source/gcc3.map))
endif
+endif
$(eval $(call gb_Library_add_linked_libs,salhelper,\
sal \
diff --git a/main/salhelper/source/makefile.mk
b/main/salhelper/source/makefile.mk
index ae8c8e0..b4d2434 100644
--- a/main/salhelper/source/makefile.mk
+++ b/main/salhelper/source/makefile.mk
@@ -70,7 +70,7 @@ SHL1VERSIONMAP=mscx.map
SHL1VERSIONMAP=gcc3os2.map
.ELIF "$(COMNAME)"=="sunpro5"
SHL1VERSIONMAP=sols.map
-.ELIF "$(COMNAME)"=="gcc3"
+.ELIF "$(COMNAME)"=="gcc3" && "$(OS)"!="MACOSX"
SHL1VERSIONMAP=gcc3.map
.ENDIF
diff --git a/main/solenv/inc/_tg_shl.mk b/main/solenv/inc/_tg_shl.mk
index d13d07c..449e1ba 100644
--- a/main/solenv/inc/_tg_shl.mk
+++ b/main/solenv/inc/_tg_shl.mk
@@ -175,7 +175,7 @@ $(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -715,7 +715,7 @@ $(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -1255,7 +1255,7 @@ $(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -1795,7 +1795,7 @@ $(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -2335,7 +2335,7 @@ $(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -2875,7 +2875,7 @@ $(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -3415,7 +3415,7 @@ $(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -3955,7 +3955,7 @@ $(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -4495,7 +4495,7 @@ $(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
@@ -5035,7 +5035,7 @@ $(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
diff --git a/main/solenv/inc/tg_shl.mk b/main/solenv/inc/tg_shl.mk
index 504569e..7c04434 100644
--- a/main/solenv/inc/tg_shl.mk
+++ b/main/solenv/inc/tg_shl.mk
@@ -180,7 +180,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE:
$(SHL$(TNR)VERSIONMAP)
.ENDIF
# Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes
sense and what
# happens if somebody will change it in the future
-.IF "$(COMID)"=="gcc3"
+.IF "$(COMID)"=="gcc3" && "$(OS)"!="MACOSX"
$(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f
$(SOLARENV)/bin/addsym.awk > $@
.ELIF "$(COMNAME)"=="sunpro5"
$(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v
$(IGNORE_SYMBOLS) > $@
