[153389] trunk/dports/aqua/qt5

[mcalhoun at macports.org]

Revision: 153389
          https://trac.macports.org/changeset/153389
Author:   mcalhoun at macports.org
Date:     2016-09-29 13:36:50 -0700 (Thu, 29 Sep 2016)
Log Message:
-----------
qt5-qtbase and qt5-*-plugins:
Don't try to find xcrun with xcrun as it is unavailable in XCode 8
Fixes #52200

Modified Paths:
--------------
    trunk/dports/aqua/qt5/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt5/files/patch-xcrun.diff

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2016-09-29 20:23:30 UTC (rev 153388)
+++ trunk/dports/aqua/qt5/Portfile	2016-09-29 20:36:50 UTC (rev 153389)
@@ -605,6 +605,10 @@
         configure.dir ${worksrcpath}/src/plugins/sqldrivers/${driver}
         build.dir     ${configure.dir}
         destroot.dir  ${configure.dir}
+
+        # see #52200
+        # see https://codereview.qt-project.org/#/c/164673/
+        patchfiles-append patch-xcrun.diff
     }
 }
 
@@ -990,6 +994,10 @@
         # see https://codereview.qt-project.org/#/c/156610/1
         patchfiles-append patch-install_examples.diff
 
+        # see #52200
+        # see https://codereview.qt-project.org/#/c/164673/
+        patchfiles-append patch-xcrun.diff
+
         #-----------------------------------------------------------------------------
         # qtbase is used for:
         #    1) building qtbase

Added: trunk/dports/aqua/qt5/files/patch-xcrun.diff
===================================================================
--- trunk/dports/aqua/qt5/files/patch-xcrun.diff	                        (rev 0)
+++ trunk/dports/aqua/qt5/files/patch-xcrun.diff	2016-09-29 20:36:50 UTC (rev 153389)
@@ -0,0 +1,49 @@
+From 77a71c32c9d19b87f79b208929e71282e8d8b5d9 Mon Sep 17 00:00:00 2001
+From: Gabriel de Dietrich <gabriel.dedietrich at qt.io>
+Date: Thu, 7 Jul 2016 16:00:17 -0700
+Subject: [PATCH 1/1] configure and mkspecs: Don't try to find xcrun with xcrun
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Since Xcode 8 (beta 2) that tool is no longer available
+through xcrun. We resort to xcodebuild instead.
+
+Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9
+Reviewed-by: Jake Petroules <jake.petroules at qt.io>
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
+Reviewed-by: Morten Johan Sørvig <morten.sorvig at qt.io>
+---
+ configure                            | 2 +-
+ mkspecs/features/mac/default_pre.prf | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index a1f0a8f..f4c7813 100755
+--- configure
++++ configure
+@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
+         exit 2
+     fi
+ 
+-    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
++    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
+         echo >&2
+         echo "   Xcode not set up properly. You may need to confirm the license" >&2
+         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
+diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
+index 0cc8cd6..5df99d1 100644
+--- mkspecs/features/mac/default_pre.prf
++++ mkspecs/features/mac/default_pre.prf
+@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
+         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
+ 
+     # Make sure Xcode is set up properly
+-    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
++    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
+         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
+ }
+ 
+-- 
+2.7.4
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160929/7db09b26/attachment.html>