[152811] trunk/dports/fuse/osxfuse
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 18 20:52:29 PDT 2016
Revision: 152811
https://trac.macports.org/changeset/152811
Author: ryandesign at macports.org
Date: 2016-09-18 20:52:29 -0700 (Sun, 18 Sep 2016)
Log Message:
-----------
osxfuse: allow Xcode 7.3 and 8.0
Fixes #50837 and #52228
Modified Paths:
--------------
trunk/dports/fuse/osxfuse/Portfile
Added Paths:
-----------
trunk/dports/fuse/osxfuse/files/patch-xcode.diff
Removed Paths:
-------------
trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff
Modified: trunk/dports/fuse/osxfuse/Portfile
===================================================================
--- trunk/dports/fuse/osxfuse/Portfile 2016-09-19 03:42:26 UTC (rev 152810)
+++ trunk/dports/fuse/osxfuse/Portfile 2016-09-19 03:52:29 UTC (rev 152811)
@@ -123,7 +123,7 @@
patchfiles patch-buildsystem.diff \
patch-kext-location.diff \
- patch-xcode-7.2.diff
+ patch-xcode.diff
post-patch {
reinplace "s,@@TMP@@,${workpath}/.tmp,g" ${worksrcpath}/build.sh
Deleted: trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff
===================================================================
--- trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff 2016-09-19 03:42:26 UTC (rev 152810)
+++ trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff 2016-09-19 03:52:29 UTC (rev 152811)
@@ -1,44 +0,0 @@
-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 "$@"
-
Copied: trunk/dports/fuse/osxfuse/files/patch-xcode.diff (from rev 152810, trunk/dports/fuse/osxfuse/files/patch-xcode-7.2.diff)
===================================================================
--- trunk/dports/fuse/osxfuse/files/patch-xcode.diff (rev 0)
+++ trunk/dports/fuse/osxfuse/files/patch-xcode.diff 2016-09-19 03:52:29 UTC (rev 152811)
@@ -0,0 +1,84 @@
+Upstream-Status: Inappropriate (Upstream has refactored their build system and this patch would no longer apply)
+--- build.sh.orig 2015-10-25 13:04:47.000000000 -0500
++++ build.sh 2016-09-18 22:33:41.000000000 -0500
+@@ -117,6 +117,15 @@
+ 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_XCODE73=""
++declare M_XCODE73_VERSION=7.3
++readonly M_XCODE73_COMPILER="com.apple.compilers.llvm.clang.1_0"
++declare M_XCODE80=""
++declare M_XCODE80_VERSION=8.0
++readonly M_XCODE80_COMPILER="com.apple.compilers.llvm.clang.1_0"
+
+ declare M_ACTUAL_PLATFORM=""
+ declare M_PLATFORMS=""
+@@ -2652,6 +2661,30 @@
+ 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
++ ;;
++ 7.3*)
++ m_version_compare $M_XCODE73_VERSION $m_xcode_version
++ if [[ $? != 2 ]]
++ then
++ M_XCODE73="$m_xcode_root"
++ M_XCODE73_VERSION=$m_xcode_version
++ fi
++ ;;
++ 8.0*)
++ m_version_compare $M_XCODE80_VERSION $m_xcode_version
++ if [[ $? != 2 ]]
++ then
++ M_XCODE73="$m_xcode_root"
++ M_XCODE73_VERSION=$m_xcode_version
++ fi
++ ;;
+ *)
+ m_log "skip unsupported Xcode version in '$m_xcode_root'."
+ ;;
+@@ -2929,6 +2962,33 @@
+ 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
++ if [[ -n "$M_XCODE73" ]]
++ then
++ m_xcode_latest="$M_XCODE73"
++
++ M_SDK_1011="$M_XCODE73/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"
++ M_SDK_1011_XCODE="$M_XCODE73"
++ M_SDK_1011_COMPILER="$M_XCODE73_COMPILER"
++ m_platform_realistic_add "10.11"
++ fi
++ if [[ -n "$M_XCODE80" ]]
++ then
++ m_xcode_latest="$M_XCODE80"
++
++ M_SDK_1012="$M_XCODE80/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"
++ M_SDK_1012_XCODE="$M_XCODE80"
++ M_SDK_1012_COMPILER="$M_XCODE80_COMPILER"
++ m_platform_realistic_add "10.12"
++ fi
+
+ m_read_input "$@"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160918/0d8aa4d1/attachment.html>
More information about the macports-changes
mailing list