Author: jim
Date: Mon Nov 27 18:53:02 2017
New Revision: 1816489
URL: http://svn.apache.org/viewvc?rev=1816489&view=rev
Log:
Build and compilation changes for macOS:
o Change optimization level
o Created shared libs do not include major/minor numbers
Modified:
openoffice/trunk/main/fpicker/Library_fps_aqua.mk
openoffice/trunk/main/framework/Library_fwk.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: openoffice/trunk/main/fpicker/Library_fps_aqua.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_aqua.mk?rev=1816489&r1=1816488&r2=1816489&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_aqua.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fps_aqua.mk Mon Nov 27 18:53:02 2017
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_o
))
$(eval $(call gb_Library_add_cxxflags,fps_aqua,\
- -x objective-c++ -DMACOSX_DEPLOYMENT_TARGET=10.7 \
+ -x objective-c++ \
))
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/framework/Library_fwk.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwk.mk?rev=1816489&r1=1816488&r2=1816489&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwk.mk (original)
+++ openoffice/trunk/main/framework/Library_fwk.mk Mon Nov 27 18:53:02 2017
@@ -61,10 +61,6 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(OS),MACOSX)
-gb_COMPILEROPTFLAGS := -O1
-endif
-
$(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/accelerators/acceleratorcache \
framework/source/accelerators/acceleratorconfiguration \
@@ -194,4 +190,10 @@ $(eval $(call gb_Library_add_exception_o
framework/source/xml/imagesdocumenthandler \
))
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ifeq ($(OS),MACOSX)
+ $(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
+ T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS)
$(gb_COMPILERNOOPTFLAGS)
+endif
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1816489&r1=1816488&r2=1816489&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Nov 27
18:53:02 2017
@@ -2023,7 +2023,7 @@ File gid_File_Lib_Apr
// Looks like the major version number is part of the name, not
// part of the suffix. An error?
#ifdef MACOSX
- Name =
STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+ Name = STRING(CONCAT2(libapr-1,UNXSUFFIX));
#elif FREEBSD
Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.5));
#else
@@ -2042,7 +2042,7 @@ File gid_File_Lib_AprUtil
// Looks like the major version number is part of the name, not
// part of the suffix. An error?
#ifdef MACOSX
- Name =
STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+ Name = STRING(CONCAT2(libaprutil-1,UNXSUFFIX));
#elif FREEBSD
Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.5));
#else
@@ -2061,7 +2061,7 @@ File gid_File_Lib_Serf
// Looks like the major version number is part of the name, not
// part of the suffix. An error?
#ifdef MACOSX
- Name = STRING(CONCAT4(libserf-,SERF_MAJOR,.0.0.0,UNXSUFFIX));
+ Name = STRING(CONCAT3(libserf-,SERF_MAJOR,UNXSUFFIX));
#elif FREEBSD
Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
#else
