Ticket #52200: qt5-xcrun.patch

File qt5-xcrun.patch, 2.9 KB (added by larryv (Lawrence Velázquez), 8 years ago)

patch to apply the other patch

  • dports/aqua/qt5/Portfile 

    diff --git a/dports/aqua/qt5/Portfile b/dports/aqua/qt5/Portfile
index 16fae2d..229e3bd 100644
    a b if { ${subport} ne ${name} } { 
    5050    use_xz yes
    5151}
    5252
     53# Tweak configure to accommodate Xcode 8.
     54# https://trac.macports.org/ticket/52200
     55patchfiles          patch-no-xcrun.diff
     56
    5357############################################################################### Modules Not Considered
    5458#
    5559# No qt5             (Doesn't Install Anything)
    … … if { ${subport} eq ${name} } { 
    618622
    619623    master_sites
    620624    distfiles
     625    patchfiles
    621626    installs_libs no
    622627    use_configure no
    623628    build {}

  • new file dports/aqua/qt5/files/patch-no-xcrun.diff 

    diff --git a/dports/aqua/qt5/files/patch-no-xcrun.diff b/dports/aqua/qt5/files/patch-no-xcrun.diff
new file mode 100644
index 0000000..c7cbb62
    - +  
     1From 77a71c32c9d19b87f79b208929e71282e8d8b5d9 Mon Sep 17 00:00:00 2001
     2From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
     3Date: Thu, 7 Jul 2016 16:00:17 -0700
     4Subject: [PATCH] configure and mkspecs: Don't try to find xcrun with xcrun
     5MIME-Version: 1.0
     6Content-Type: text/plain; charset=UTF-8
     7Content-Transfer-Encoding: 8bit
     8
     9Since Xcode 8 (beta 2) that tool is no longer available
     10through xcrun. We resort to xcodebuild instead.
     11
     12Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9
     13Reviewed-by: Jake Petroules <jake.petroules@qt.io>
     14Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
     15Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
     16---
     17 configure                            | 2 +-
     18 mkspecs/features/mac/default_pre.prf | 2 +-
     19 2 files changed, 2 insertions(+), 2 deletions(-)
     20
     21diff --git configure configure
     22index a1f0a8f..f4c7813 100755
     23--- configure
     24+++ configure
     25@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
     26         exit 2
     27     fi
     28 
     29-    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
     30+    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
     31         echo >&2
     32         echo "   Xcode not set up properly. You may need to confirm the license" >&2
     33         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
     34diff --git mkspecs/features/mac/default_pre.prf mkspecs/features/mac/default_pre.prf
     35index 0cc8cd6..5df99d1 100644
     36--- mkspecs/features/mac/default_pre.prf
     37+++ mkspecs/features/mac/default_pre.prf
     38@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
     39         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
     40 
     41     # Make sure Xcode is set up properly
     42-    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
     43+    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
     44         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
     45 }
     46 
     47--
     482.9.3
     49