openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1811585 - in /openoffice/trunk/main: configure.ac solenv/inc/unxmacc.mk solenv/inc/unxmacx.mk vcl/Library_vcl.mk
Date Mon, 09 Oct 2017 17:07:52 GMT
Author: jim
Date: Mon Oct  9 17:07:51 2017
New Revision: 1811585

URL: http://svn.apache.org/viewvc?rev=1811585&view=rev
Log:
Get macOS compiling again:
 o Restore 10.7 as min
 o Deprecated is no longer a fatal warning error
 o We need LDFLAGS when linking

Modified:
    openoffice/trunk/main/configure.ac
    openoffice/trunk/main/solenv/inc/unxmacc.mk
    openoffice/trunk/main/solenv/inc/unxmacx.mk
    openoffice/trunk/main/vcl/Library_vcl.mk

Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1811585&r1=1811584&r2=1811585&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Mon Oct  9 17:07:51 2017
@@ -3824,16 +3824,16 @@ AC_SUBST(LIBXML_LIBS)
 
 
 dnl ===================================================================
-dnl Checks for a MacOS platform SDK compatible with an OSX 10.9 deployment target
+dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment target
 dnl ===================================================================
 if test  "$_os" = "Darwin"; then
-   sdk_target=10.9
+   sdk_target=10.7
    AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target])
 
    sdk_minor=`echo $sdk_target | cut -d"." -f2`
 
-   if test "$sdk_minor" -lt "9"; then
-      AC_MSG_ERROR([SDK version < 10.9 is not longer supported])
+   if test "$sdk_minor" -lt "7"; then
+      AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
    else
       MACOSX_DEPLOYMENT_TARGET=$sdk_target
 

Modified: openoffice/trunk/main/solenv/inc/unxmacc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacc.mk?rev=1811585&r1=1811584&r2=1811585&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacc.mk Mon Oct  9 17:07:51 2017
@@ -142,7 +142,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment

Modified: openoffice/trunk/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacx.mk?rev=1811585&r1=1811584&r2=1811585&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacx.mk Mon Oct  9 17:07:51 2017
@@ -143,7 +143,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment

Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1811585&r1=1811584&r2=1811585&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Mon Oct  9 17:07:51 2017
@@ -105,6 +105,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
 
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+))
+endif
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
     $(gb_OBJCXXFLAGS) \



Mime
View raw message