openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1643177 - /openoffice/trunk/main/configure.in
Date Fri, 05 Dec 2014 07:46:41 GMT
Author: hdu
Date: Fri Dec  5 07:46:41 2014
New Revision: 1643177

URL: http://svn.apache.org/viewvc?rev=1643177&view=rev
Log:
#i125921# fix autodetection of the OSX 10.10 SDK

which failed because the autodetection only worked with single-digit
minor-versions.

Patch-by: Thorsten Wagner <thorsten.wagner.4@gmail.com>
Found-by: Thorsten Wagner <thorsten.wagner.4@gmail.com>
Review-by: Herbert Duerr <hdu@apache.org>

Modified:
    openoffice/trunk/main/configure.in

Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1643177&r1=1643176&r2=1643177&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Fri Dec  5 07:46:41 2014
@@ -3936,7 +3936,7 @@ if test  "$_os" = "Darwin"; then
    else
       MACOSX_DEPLOYMENT_TARGET=$sdk_target
 
-      sdk_found=`xcodebuild -showsdks | grep "sdk macosx10.[[789]]" | sed -e "s/.*sdk //"
| head -n1`
+      sdk_found=`xcodebuild -showsdks | egrep "sdk macosx10.(7|8|9|10)" | sed -e "s/.*sdk
//" | tail -n1`
       if test -z "$sdk_found"; then
          AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
       else



Mime
View raw message