[136008] trunk/dports/fuse/osxfuse

ryandesign at macports.org ryandesign at macports.org
Sat May 9 05:21:50 PDT 2015


Revision: 136008
          https://trac.macports.org/changeset/136008
Author:   ryandesign at macports.org
Date:     2015-05-09 05:21:50 -0700 (Sat, 09 May 2015)
Log Message:
-----------
osxfuse: add support for building with Xcode 6.3 and 6.4 (#47438)

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

Added Paths:
-----------
    trunk/dports/fuse/osxfuse/files/patch-Xcode-6.3-6.4.diff

Modified: trunk/dports/fuse/osxfuse/Portfile
===================================================================
--- trunk/dports/fuse/osxfuse/Portfile	2015-05-09 12:11:05 UTC (rev 136007)
+++ trunk/dports/fuse/osxfuse/Portfile	2015-05-09 12:21:50 UTC (rev 136008)
@@ -124,6 +124,8 @@
 patchfiles          patch-buildsystem.diff \
                     patch-kext-location.diff
 
+patchfiles-append   patch-Xcode-6.3-6.4.diff
+
 post-patch {
     # Perhaps the ports sandbox does not let us write to /tmp.
     # For a quick and temporary fix use this reinplace.

Added: trunk/dports/fuse/osxfuse/files/patch-Xcode-6.3-6.4.diff
===================================================================
--- trunk/dports/fuse/osxfuse/files/patch-Xcode-6.3-6.4.diff	                        (rev 0)
+++ trunk/dports/fuse/osxfuse/files/patch-Xcode-6.3-6.4.diff	2015-05-09 12:21:50 UTC (rev 136008)
@@ -0,0 +1,77 @@
+Add support for Xcode 6.3 and 6.4
+https://github.com/osxfuse/osxfuse/commit/59c9336cd43d094a35b4ca9029bd2f5e0368b7a1
+--- build.sh.orig
++++ build.sh
+@@ -105,6 +105,12 @@ readonly M_XCODE61_COMPILER="com.apple.compilers.llvm.clang.1_0"
+ declare M_XCODE62=""
+ declare M_XCODE62_VERSION=6.2
+ readonly M_XCODE62_COMPILER="com.apple.compilers.llvm.clang.1_0"
++declare M_XCODE63=""
++declare M_XCODE63_VERSION=6.3
++readonly M_XCODE63_COMPILER="com.apple.compilers.llvm.clang.1_0"
++declare M_XCODE64=""
++declare M_XCODE64_VERSION=6.4
++readonly M_XCODE64_COMPILER="com.apple.compilers.llvm.clang.1_0"
+ 
+ declare M_ACTUAL_PLATFORM=""
+ declare M_PLATFORMS=""
+@@ -2569,6 +2575,22 @@ function m_handler()
+                     M_XCODE62_VERSION=$m_xcode_version
+                 fi
+                 ;;
++            6.3*)
++                m_version_compare $M_XCODE63_VERSION $m_xcode_version
++                if [[ $? != 2 ]]
++                then
++                    M_XCODE63="$m_xcode_root"
++                    M_XCODE63_VERSION=$m_xcode_version
++                fi
++                ;;
++            6.4*)
++                m_version_compare $M_XCODE64_VERSION $m_xcode_version
++                if [[ $? != 2 ]]
++                then
++                    M_XCODE64="$m_xcode_root"
++                    M_XCODE64_VERSION=$m_xcode_version
++                fi
++                ;;
+             *)
+                 m_log "skip unsupported Xcode version in '$m_xcode_root'."
+                 ;;
+@@ -2786,6 +2808,36 @@ function m_handler()
+         M_SDK_1010_COMPILER="$M_XCODE62_COMPILER"
+         m_platform_realistic_add "10.10"
+     fi
++    if [[ -n "$M_XCODE63" ]]
++    then
++        m_xcode_latest="$M_XCODE63"
++
++        M_SDK_109="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
++        M_SDK_109_XCODE="$M_XCODE63"
++        M_SDK_109_COMPILER="$M_XCODE63_COMPILER"
++        m_platform_realistic_add "10.9"
++        m_platform_add "10.10"
++
++        M_SDK_1010="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"
++        M_SDK_1010_XCODE="$M_XCODE63"
++        M_SDK_1010_COMPILER="$M_XCODE63_COMPILER"
++        m_platform_realistic_add "10.10"
++    fi
++    if [[ -n "$M_XCODE64" ]]
++    then
++        m_xcode_latest="$M_XCODE64"
++
++        M_SDK_109="$M_XCODE64/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
++        M_SDK_109_XCODE="$M_XCODE64"
++        M_SDK_109_COMPILER="$M_XCODE64_COMPILER"
++        m_platform_realistic_add "10.9"
++        m_platform_add "10.10"
++
++        M_SDK_1010="$M_XCODE64/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"
++        M_SDK_1010_XCODE="$M_XCODE64"
++        M_SDK_1010_COMPILER="$M_XCODE64_COMPILER"
++        m_platform_realistic_add "10.10"
++    fi
+ 
+     m_read_input "$@"
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150509/a7b014d3/attachment.html>


More information about the macports-changes mailing list