[143880] trunk/dports/fuse/osxfuse

cal at macports.org cal at macports.org
Thu Dec 24 05:50:12 PST 2015


Revision: 143880
          https://trac.macports.org/changeset/143880
Author:   cal at macports.org
Date:     2015-12-24 05:50:12 -0800 (Thu, 24 Dec 2015)
Log Message:
-----------
osxfuse: Fix build on El Cap, closes #49979

Maintainer timeout, not submitting patch upstream because upstream has
refactored their build system and the problem likely no longer occurs with the
refactored version. In any case, this patch wouldn't apply.

Modified Paths:
--------------
    trunk/dports/fuse/osxfuse/Portfile

Added Paths:
-----------
    trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff

Modified: trunk/dports/fuse/osxfuse/Portfile
===================================================================
--- trunk/dports/fuse/osxfuse/Portfile	2015-12-24 13:26:51 UTC (rev 143879)
+++ trunk/dports/fuse/osxfuse/Portfile	2015-12-24 13:50:12 UTC (rev 143880)
@@ -122,7 +122,8 @@
 }
 
 patchfiles          patch-buildsystem.diff \
-                    patch-kext-location.diff
+                    patch-kext-location.diff \
+                    patch-xcode-7.2.diff
 
 post-patch {
     reinplace "s,@@TMP@@,${workpath}/.tmp,g" ${worksrcpath}/build.sh

Added: trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff
===================================================================
--- trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff	                        (rev 0)
+++ trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff	2015-12-24 13:50:12 UTC (rev 143880)
@@ -0,0 +1,44 @@
+Upstream-Status: Inappropriate (Upstream has refactored their build system and this patch would no longer apply)
+--- build.sh.orig	2015-12-11 15:04:10.000000000 +0100
++++ build.sh	2015-12-11 15:04:41.000000000 +0100
+@@ -117,6 +117,9 @@
+ declare M_XCODE71=""
+ declare M_XCODE71_VERSION=7.1
+ readonly M_XCODE71_COMPILER="com.apple.compilers.llvm.clang.1_0"
++declare M_XCODE72=""
++declare M_XCODE72_VERSION=7.2
++readonly M_XCODE72_COMPILER="com.apple.compilers.llvm.clang.1_0"
+ 
+ declare M_ACTUAL_PLATFORM=""
+ declare M_PLATFORMS=""
+@@ -2652,6 +2655,14 @@
+                     M_XCODE71_VERSION=$m_xcode_version
+                 fi
+                 ;;
++            7.2*)
++                m_version_compare $M_XCODE72_VERSION $m_xcode_version
++                if [[ $? != 2 ]]
++                then
++                    M_XCODE72="$m_xcode_root"
++                    M_XCODE72_VERSION=$m_xcode_version
++                fi
++                ;;
+             *)
+                 m_log "skip unsupported Xcode version in '$m_xcode_root'."
+                 ;;
+@@ -2929,6 +2940,15 @@
+         M_SDK_1011_COMPILER="$M_XCODE71_COMPILER"
+         m_platform_realistic_add "10.11"
+     fi
++    if [[ -n "$M_XCODE72" ]]
++    then
++        m_xcode_latest="$M_XCODE72"
++
++        M_SDK_1011="$M_XCODE72/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"
++        M_SDK_1011_XCODE="$M_XCODE72"
++        M_SDK_1011_COMPILER="$M_XCODE72_COMPILER"
++        m_platform_realistic_add "10.11"
++    fi
+ 
+     m_read_input "$@"
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151224/9bb2f46e/attachment.html>


More information about the macports-changes mailing list