You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2020/12/07 12:10:37 UTC
[openoffice] branch trunk updated: Baseline min macOS 10.9,
which allows us to enable class_type_Info
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 8da8460 Baseline min macOS 10.9, which allows us to enable class_type_Info
8da8460 is described below
commit 8da84604d15d38bc330a51952fcbd1fd3bc3c0b8
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon Dec 7 07:09:30 2020 -0500
Baseline min macOS 10.9, which allows us to enable class_type_Info
(cherry picked from commit 5fa6f516bd41216278344a21128f24a1cd5dc20b)
---
main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 7 -------
main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx | 4 ----
main/configure.ac | 10 +++++-----
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 0d64e70..317e14a 100644
--- a/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -179,10 +179,6 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
const OString aCUnoName = OUStringToOString( unoName, RTL_TEXTENCODING_UTF8);
OSL_TRACE( "TypeInfo for \"%s\" not found and cannot be generated.\n", aCUnoName.getStr());
#endif
-#if 0 // TODO: enable it again when the generated class_type_infos always work.
- // Forcing the toolchain to create authentic typeinfos is much better though
- // than the sick concept of reverse-engineering the platform's toolchain
- // and generating the missing type_infos.
if (pTypeDescr->pBaseTypeDescription)
{
// ensure availability of base
@@ -196,9 +192,6 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
// this class has no base class
rtti = new __class_type_info( strdup( rttiName ) );
}
-#else
- rtti = NULL;
-#endif
pair< t_rtti_map::iterator, bool > insertion(
m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
diff --git a/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index c3c84d6..eb5f952 100644
--- a/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/main/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -85,8 +85,6 @@ extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
// -----
-#if 0 // #i124421# disabled because its use in except.cxx is disabled
-
// on OSX 64bit the class_type_info classes are specified
// in http://refspecs.linuxbase.org/cxxabi-1.86.html#rtti but
// these details are not generally available in a public header
@@ -108,8 +106,6 @@ public:
{}
};
-#endif
-
//==================================================================================================
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
diff --git a/main/configure.ac b/main/configure.ac
index f6203f3..3951898 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -931,8 +931,8 @@ AC_ARG_WITH(arm-target,
AC_ARG_WITH(macosx-target,
[ --macosx-target The minimal macOS/OSX deployment and build target
- Usage: --with-macosx-target=10.7
-],with_macosx_target=$withval,with_macosx_target=10.7)
+ Usage: --with-macosx-target=10.9
+],with_macosx_target=$withval,with_macosx_target=10.9)
AC_ARG_WITH(macosx-sdk,
[ --macosx-sdk The macOS SDK to build against
@@ -3889,8 +3889,8 @@ if test "$_os" = "Darwin"; then
sdk_minor=`echo $sdk_target | cut -d"." -f2`
- if test "$sdk_minor" -lt "7"; then
- AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
+ if test "$sdk_minor" -lt "9"; then
+ AC_MSG_ERROR([SDK version < 10.9 is not longer supported])
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
sdk_path=$with_macosx_sdk
@@ -3898,7 +3898,7 @@ if test "$_os" = "Darwin"; then
dnl --macosx-sdk not used (or blank): We look for the SDK
dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
dnl First look for macOS10.x SDKs (Up thru Xcode 12.1)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11|12|13|14|15)" | sed -e "s/.*sdk //" | tail -n1`
dnl If not found, look for macOS11.x SDKs (Xcode 12.2 and later)
if test -z "$sdk_found"; then
sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx11.(0)" | sed -e "s/.*sdk //" | tail -n1`