[openoffice] 01/02: No longer s5abi, but gcc3

[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

commit 155004b42e42d82035faca5e96b3d18ef9bdc9c5
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Sat Dec 5 11:52:49 2020 -0500

    No longer s5abi, but gcc3
    
    (cherry picked from commit 61678ba51e62894585bdb0dd8da77443813a4576)
---
 main/Repository.mk            | 1 -
 main/odk/setsdkenv_unix.sh.in | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/Repository.mk b/main/Repository.mk
index 18ce170..ed868e5 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -217,7 +217,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	jpipx \
 	msci_uno \
 	mscx_uno \
-	s5abi_uno \
 	sunjavaplugin \
 	sunpro5_uno \
 	xmlreader \
diff --git a/main/odk/setsdkenv_unix.sh.in b/main/odk/setsdkenv_unix.sh.in
index c7942b0..0c2ef36 100644
--- a/main/odk/setsdkenv_unix.sh.in
+++ b/main/odk/setsdkenv_unix.sh.in
@@ -160,7 +160,7 @@ case ${sdk_platform} in
 
   darwin*)
     directoryname=macosx
-    comid=s5abi
+    comid=gcc3
     soext=dylib
     exampleout=MACOSXexample.out
     platform=MacOSX