Author: jim
Date: Wed Nov 29 13:02:36 2017
New Revision: 1816626
URL: http://svn.apache.org/viewvc?rev=1816626&view=rev
Log:
OK, let's try to maintain 10.7 as the min OSX version supported.
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/solenv/gbuild/platform/macosx.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=1816626&r1=1816625&r2=1816626&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Wed Nov 29 13:02:36 2017
@@ -3827,21 +3827,21 @@ 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
dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11)" | sed -e
"s/.*sdk //" | head -n1`
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|10|11)" |
sed -e "s/.*sdk //" | head -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1816626&r1=1816625&r2=1816626&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Wed Nov 29 13:02:36
2017
@@ -107,6 +107,11 @@ ifneq ($(COM),GCC)
gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
endif
+ifeq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7
10.8))
+ gb_CXXFLAGS += -std=c++11 -stdlib=libc++
+ gb_macos_LDFLAGS := -std=c++11 -stdlib=libc++
+endif
+
# these are to get g++ to switch to Objective-C++ mode
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
@@ -280,7 +285,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
- $(T_LDFLAGS) \
+ $(T_LDFLAGS) $(gb_macos_LDFLAGS) \
$(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1816626&r1=1816625&r2=1816626&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Wed Nov 29 13:02:36 2017
@@ -511,7 +511,8 @@ $(eval $(call gb_Library_add_libs,vcl,\
-framework CoreFoundation \
))
# ??? what about this
-ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+#ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7
10.8))
$(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
endif
endif
