[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk framework/Library_fwk.mk scp2/source

[Jim Jagielski]

 fpicker/Library_fps_aqua.mk          |    2 +-
 framework/Library_fwk.mk             |   10 ++++++----
 scp2/source/ooo/file_library_ooo.scp |    6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 8cb278ca61ead3b779e0402c1d77cacc7ea35e27
Author: Jim Jagielski <jim at apache.org>
Date:   Mon Nov 27 18:53:02 2017 +0000

    Build and compilation changes for macOS:
    
    o Change optimization level
    o Created shared libs do not include major/minor numbers

diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 0f792efe9e92..bb4ddf9a21c5 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
 ))
 
 $(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:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index eca095d0764e..fd66cae227c7 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,10 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
     $(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_objects,fwk,\
     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:
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e318922809c7..d433b01df9c0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -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