[131933] trunk/dports/lang
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 21 00:52:12 PST 2015
Revision: 131933
https://trac.macports.org/changeset/131933
Author: jeremyhu at macports.org
Date: 2015-01-21 00:52:11 -0800 (Wed, 21 Jan 2015)
Log Message:
-----------
llvm-3.[567]: Use -fobjc-runtime=macosx-fragile-... when targeting darwin/ppc
Modified Paths:
--------------
trunk/dports/lang/llvm-3.5/Portfile
trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.6/Portfile
trunk/dports/lang/llvm-3.7/Portfile
Added Paths:
-----------
trunk/dports/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
trunk/dports/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
Modified: trunk/dports/lang/llvm-3.5/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.5/Portfile 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/Portfile 2015-01-21 08:52:11 UTC (rev 131933)
@@ -130,6 +130,8 @@
1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch \
1006-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+ 1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Do-not-build-a-separate-x86_64h-Haswell-slice-for-th.patch \
2003-Build-Darwin-libclang_rt-libraries-against-real-SDKs.patch \
Modified: trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From be249dfc99009e07f65c01463ac62d9592aa00d7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:50:24 -0800
-Subject: [PATCH 1001/1006] MacPorts Only: Prepare clang-format for replacement
+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
with absolute path
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Modified: trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1002-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From 61fae0901db990788b0db66406afdfb4ba75f2dc Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:55:27 -0800
-Subject: [PATCH 1002/1006] MacPorts Only: Fix name of scan-view executable
+Subject: [PATCH 1002/1008] MacPorts Only: Fix name of scan-view executable
inside scan-build
http://trac.macports.org/ticket/35006
Modified: trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1003-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From f4ceb2cbee715c5c3e795818b21dfd70928d6a81 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:56:44 -0800
-Subject: [PATCH 1003/1006] MacPorts Only: Fix libclang_rt dylib ids
+Subject: [PATCH 1003/1008] MacPorts Only: Fix libclang_rt dylib ids
We should probably not be shipping these.
Modified: trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From a16420beabdb6d675c48d4c546fb827247e4d287 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:58:25 -0800
-Subject: [PATCH 1004/1006] MacPorts Only: Relocate clang resources using llvm
+Subject: [PATCH 1004/1008] MacPorts Only: Relocate clang resources using llvm
version
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Modified: trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1005-Call-powerpc-darwin-external-tools-with-arch-ppc.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From 85b43b6a6cabfbf2b8b65c91c921c92a86e2ffee Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola at gmail.com>
Date: Thu, 28 Aug 2014 21:23:05 +0000
-Subject: [PATCH 1005/1006] Call powerpc-darwin external tools with -arch ppc.
+Subject: [PATCH 1005/1008] Call powerpc-darwin external tools with -arch ppc.
With this patch we call external tools for powerpc-darwin with "-arch ppc"
instead of "-arch powerpc", so as to be compatible with the cctools assembler
Modified: trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.5/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,7 +1,7 @@
From fb1d2809e5d8bc633fb5e4131e1896078fb2da70 Mon Sep 17 00:00:00 2001
From: Iain Sandoe <iain at codesourcery.com>
Date: Sun, 27 Jul 2014 20:35:16 +0100
-Subject: [PATCH 1006/1006] Default to ppc7400 for OSX 10.5+
+Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
(cherry picked from commit 971aa68baad8c240f1abf30e62bd947a8923e3fa)
---
Added: trunk/dports/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,30 @@
+From dacdb84b2114efa6a42bc5c20ba2cd2001a83e94 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:08:57 -0800
+Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
+ PRIO_DARWIN_BG) if it is available
+
+Tiger and earlier versions of darwin do not support this.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 92a47c4641be0c3fbc0e660f5680b3d4d524887f)
+---
+ tools/libclang/CIndex.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_release_35/tools/clang/tools/libclang/CIndex.cpp macports_release_35/tools/clang/tools/libclang/CIndex.cpp
+index fc8703a..c46d258 100644
+--- llvm_release_35/tools/clang/tools/libclang/CIndex.cpp
++++ macports_release_35/tools/clang/tools/libclang/CIndex.cpp
+@@ -6881,7 +6881,7 @@ void clang::setThreadBackgroundPriority() {
+ if (getenv("LIBCLANG_BGPRIO_DISABLE"))
+ return;
+
+-#ifdef USE_DARWIN_THREADS
++#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
+ setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
+ #endif
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (rev 0)
+++ trunk/dports/lang/llvm-3.5/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,32 @@
+From cac98596c74040bef53be8cb6882f301c0fb9ffa Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 20 Jan 2015 00:09:16 -0800
+Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
+ darwin/ppc
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 4f54947c85c0b54d17577d5387d0b01068bb4f80)
+---
+ lib/Driver/ToolChains.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_release_35/tools/clang/lib/Driver/ToolChains.h macports_release_35/tools/clang/lib/Driver/ToolChains.h
+index b5df866..bc9f273 100644
+--- llvm_release_35/tools/clang/lib/Driver/ToolChains.h
++++ macports_release_35/tools/clang/lib/Driver/ToolChains.h
+@@ -272,8 +272,10 @@ public:
+ }
+
+ bool IsObjCNonFragileABIDefault() const override {
+- // Non-fragile ABI is default for everything but i386.
+- return getTriple().getArch() != llvm::Triple::x86;
++ // Non-fragile ABI is default for legacy architectures
++ return getTriple().getArch() != llvm::Triple::x86 &&
++ getTriple().getArch() != llvm::Triple::ppc &&
++ getTriple().getArch() != llvm::Triple::ppc64;
+ }
+
+ bool UseObjCMixedDispatch() const override {
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.6/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.6/Portfile 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/Portfile 2015-01-21 08:52:11 UTC (rev 131933)
@@ -104,12 +104,14 @@
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
- 1001-Default-to-ppc7400-for-OSX-10.5.patch \
- 1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
- 1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
- 1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
- 1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
- 1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
+ 1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1006-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+ 1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
Deleted: trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,26 +0,0 @@
-From 971aa68baad8c240f1abf30e62bd947a8923e3fa Mon Sep 17 00:00:00 2001
-From: Iain Sandoe <iain at codesourcery.com>
-Date: Sun, 27 Jul 2014 20:35:16 +0100
-Subject: [PATCH 1001/1006] Default to ppc7400 for OSX 10.5+
-
----
- lib/Driver/Tools.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
-index db43fde..46956e7 100644
---- llvm_master/tools/clang/lib/Driver/Tools.cpp
-+++ macports_master/tools/clang/lib/Driver/Tools.cpp
-@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
- TargetCPUName = "ppc64";
- else if (T.getArch() == llvm::Triple::ppc64le)
- TargetCPUName = "ppc64le";
-+ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
-+ // For 10.5+ Altivec is assumed available.
-+ TargetCPUName = "7400";
- else
- TargetCPUName = "ppc";
- }
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,84 @@
+From 6fdbdc072ecd1eac579af61e5985cb935d02a52b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:50:24 -0800
+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/clang-format/clang-format-bbedit.applescript | 2 +-
+ tools/clang-format/clang-format-diff.py | 2 +-
+ tools/clang-format/clang-format-sublime.py | 2 +-
+ tools/clang-format/clang-format.el | 3 +--
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
+ end tell
+
+ set filePath to urlToPOSIXPath(fileURL)
+-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
+
+ tell application "BBEdit"
+ -- "set contents of text document 1 to newContents" scrolls to the bottom while
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+index 23adb07..063c5d2 100755
+--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,7 @@ import sys
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
+index ab0991b..a2a278a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.el
++++ macports_master/tools/clang/tools/clang-format/clang-format.el
+@@ -36,8 +36,7 @@
+ :group 'tools)
+
+ (defcustom clang-format-executable
+- (or (executable-find "clang-format")
+- "clang-format")
++ "@CLANG_FORMAT_PATH@"
+ "Location of the clang-format executable.
+
+ A string containing the name or the full path of the executable."
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
+index a79205a..e71362a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.py
++++ macports_master/tools/clang/tools/clang-format/clang-format.py
+@@ -25,7 +25,7 @@ import vim
+
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,39 @@
+From 3a51db8fffb0298c927fb8a183d47392027bbbc6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:51:10 -0800
+Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
+ xcrun --sdk is not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index f06ef99..b0946ba 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
+ profile_osx.a \
+ ubsan_osx.a
+
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++ $(shell \
++ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
++ if [ "$$?" != "0" ]; then result=""; fi; \
++ echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,84 +0,0 @@
-From d95bdf342037ee815fa21e871dd9479bc3572550 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:50:24 -0800
-Subject: [PATCH 1002/1006] MacPorts Only: Prepare clang-format for replacement
- with absolute path
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- tools/clang-format/clang-format-bbedit.applescript | 2 +-
- tools/clang-format/clang-format-diff.py | 2 +-
- tools/clang-format/clang-format-sublime.py | 2 +-
- tools/clang-format/clang-format.el | 3 +--
- tools/clang-format/clang-format.py | 2 +-
- 5 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-index fa88fe9..eb09448 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-@@ -15,7 +15,7 @@ tell application "BBEdit"
- end tell
-
- set filePath to urlToPOSIXPath(fileURL)
--set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-+set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-
- tell application "BBEdit"
- -- "set contents of text document 1 to newContents" scrolls to the bottom while
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
-index 23adb07..063c5d2 100755
---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
-@@ -32,7 +32,7 @@ import sys
-
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
-
- def main():
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
-index 16ff56e..4b68104 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
-@@ -18,7 +18,7 @@ import sublime_plugin
- import subprocess
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
-index ab0991b..a2a278a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.el
-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
-@@ -36,8 +36,7 @@
- :group 'tools)
-
- (defcustom clang-format-executable
-- (or (executable-find "clang-format")
-- "clang-format")
-+ "@CLANG_FORMAT_PATH@"
- "Location of the clang-format executable.
-
- A string containing the name or the full path of the executable."
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
-index a79205a..e71362a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
-@@ -25,7 +25,7 @@ import vim
-
- # set g:clang_format_path to the path to clang-format if it is not on the path
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
- if vim.eval('exists("g:clang_format_path")') == "1":
- binary = vim.eval('g:clang_format_path')
-
---
-2.2.2
-
Deleted: trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,39 +0,0 @@
-From c69389a9ad48948076d754f99b94fbf797ea01fd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:51:10 -0800
-Subject: [PATCH 1003/1006] MacPorts Only: Fall back on xcodebuild -sdk when
- xcrun --sdk is not supported
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- runtime/compiler-rt/Makefile | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..b0946ba 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
- profile_osx.a \
- ubsan_osx.a
-
--IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
--IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
-+XCRunSdkPath = \
-+ $(shell \
-+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
-+ if [ "$$?" != "0" ]; then result=""; fi; \
-+ echo $$result)
-+
-+IOS_SDK := $(call XCRunSdkPath,iphoneos)
-+IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
-
- ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,29 @@
+From 95d6351d09e6ed8b288d0801ee9c8970477fdb57 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:55:27 -0800
+Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
+ inside scan-build
+
+http://trac.macports.org/ticket/35006
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
+index d52d8f5..2a3d1db 100755
+--- llvm_master/tools/clang/tools/scan-build/scan-build
++++ macports_master/tools/clang/tools/scan-build/scan-build
+@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
+ Diag "Analysis run complete.\n";
+ Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+ my $ScanView = Cwd::realpath("$RealBin/scan-view");
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+ if (! -x $ScanView) { $ScanView = "scan-view"; }
+ exec $ScanView, "$HtmlDir";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,27 @@
+From 3459ae4f0909a6ab1fb5df79db042609b56a9231 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:56:44 -0800
+Subject: [PATCH 1004/1008] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index b0946ba..5549038 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+ $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
+ $(Echo) Installing compiler runtime library: $1/$$*
+ $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
++ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
+
+ # Rule to install runtime libraries.
+ RuntimeLibraryInstall.$1: \
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,29 +0,0 @@
-From cf37a2cc4435f757228e928f5fbfb6cadd1b2e21 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:55:27 -0800
-Subject: [PATCH 1004/1006] MacPorts Only: Fix name of scan-view executable
- inside scan-build
-
-http://trac.macports.org/ticket/35006
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- tools/scan-build/scan-build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
-index d52d8f5..2a3d1db 100755
---- llvm_master/tools/clang/tools/scan-build/scan-build
-+++ macports_master/tools/clang/tools/scan-build/scan-build
-@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
- Diag "Analysis run complete.\n";
- Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
- my $ScanView = Cwd::realpath("$RealBin/scan-view");
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
- if (! -x $ScanView) { $ScanView = "scan-view"; }
- exec $ScanView, "$HtmlDir";
- }
---
-2.2.2
-
Deleted: trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,27 +0,0 @@
-From 1e79aa1d2d652fe79c244c185eeff76c2e40caf2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:56:44 -0800
-Subject: [PATCH 1005/1006] MacPorts Only: Fix libclang_rt dylib ids
-
-We should probably not be shipping these.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- runtime/compiler-rt/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index b0946ba..5549038 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
- $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- $(Echo) Installing compiler runtime library: $1/$$*
- $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,74 @@
+From 2984534bbb28860bef27168878a91cead3474cb3 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:58:25 -0800
+Subject: [PATCH 1005/1008] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_master/tools/clang/lib/Headers/Makefile
++++ macports_master/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index 5549038..50f0a81 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++ $(Echo) Creating compiler runtime compatibility symlink
++ $(Verb) $(MKDIR) $(dir $@)
++ $(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,26 @@
+From 07ba2946e8edd7dd65126fa5108c14474a916f34 Mon Sep 17 00:00:00 2001
+From: Iain Sandoe <iain at codesourcery.com>
+Date: Sun, 27 Jul 2014 20:35:16 +0100
+Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
+
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
+index db43fde..46956e7 100644
+--- llvm_master/tools/clang/lib/Driver/Tools.cpp
++++ macports_master/tools/clang/lib/Driver/Tools.cpp
+@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
+ TargetCPUName = "ppc64";
+ else if (T.getArch() == llvm::Triple::ppc64le)
+ TargetCPUName = "ppc64le";
++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++ // For 10.5+ Altivec is assumed available.
++ TargetCPUName = "7400";
+ else
+ TargetCPUName = "ppc";
+ }
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.6/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,74 +0,0 @@
-From 0111fcf6f32dfeb41ae0b1e9be0258b899d97200 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:58:25 -0800
-Subject: [PATCH 1006/1006] MacPorts Only: Relocate clang resources using llvm
- version
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Headers/Makefile | 3 ++-
- runtime/compiler-rt/Makefile | 15 ++++++++++++++-
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
-index 903acac..7c37992 100644
---- llvm_master/tools/clang/lib/Headers/Makefile
-+++ macports_master/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
-
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
-
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index 5549038..50f0a81 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
-
- ResourceLibDir := $(ResourceDir)/lib
- ResourceIncludeDir := $(ResourceDir)/include
-@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
- RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
- .PHONY: RuntimeHeaderInstall
-
-+# Make sure $(PROJ_resources) exists before creating the symlink.
-+$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
-+ $(Echo) Creating compiler runtime compatibility symlink
-+ $(Verb) $(MKDIR) $(dir $@)
-+ $(Verb) ln -s $(LLVM_VERSION) $@
-+
-+MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
-+.PHONY: MacPortsClangResSymlinkInstall
-+
- # Hook into the standard Makefile rules.
- all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
- install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
-+ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
-+install-local:: MacPortsClangResSymlinkInstall
-+endif
- clean-local:: CleanRuntimeLibraries
-
- endif
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,29 @@
+From a98b6c303f44aa9f55c766aab1db65873a4e9c71 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:08:57 -0800
+Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
+ PRIO_DARWIN_BG) if it is available
+
+Tiger and earlier versions of darwin do not support this.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/libclang/CIndex.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
+index 00ef8c0..6f124be 100644
+--- llvm_master/tools/clang/tools/libclang/CIndex.cpp
++++ macports_master/tools/clang/tools/libclang/CIndex.cpp
+@@ -7044,7 +7044,7 @@ void clang::setThreadBackgroundPriority() {
+ if (getenv("LIBCLANG_BGPRIO_DISABLE"))
+ return;
+
+-#ifdef USE_DARWIN_THREADS
++#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
+ setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
+ #endif
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (rev 0)
+++ trunk/dports/lang/llvm-3.6/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,31 @@
+From 4f54947c85c0b54d17577d5387d0b01068bb4f80 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 20 Jan 2015 00:09:16 -0800
+Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
+ darwin/ppc
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h
+index 47fb10d..80535f5 100644
+--- llvm_master/tools/clang/lib/Driver/ToolChains.h
++++ macports_master/tools/clang/lib/Driver/ToolChains.h
+@@ -273,8 +273,10 @@ public:
+ }
+
+ bool IsObjCNonFragileABIDefault() const override {
+- // Non-fragile ABI is default for everything but i386.
+- return getTriple().getArch() != llvm::Triple::x86;
++ // Non-fragile ABI is default for legacy architectures
++ return getTriple().getArch() != llvm::Triple::x86 &&
++ getTriple().getArch() != llvm::Triple::ppc &&
++ getTriple().getArch() != llvm::Triple::ppc64;
+ }
+
+ bool UseObjCMixedDispatch() const override {
+--
+2.2.2
+
Modified: trunk/dports/lang/llvm-3.7/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.7/Portfile 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/Portfile 2015-01-21 08:52:11 UTC (rev 131933)
@@ -104,12 +104,14 @@
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
- 1001-Default-to-ppc7400-for-OSX-10.5.patch \
- 1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
- 1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
- 1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
- 1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
- 1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch \
+ 1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch \
+ 1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch \
+ 1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch \
+ 1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch \
+ 1006-Default-to-ppc7400-for-OSX-10.5.patch \
+ 1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
+ 1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch \
2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch \
2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch \
Deleted: trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1001-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,26 +0,0 @@
-From 971aa68baad8c240f1abf30e62bd947a8923e3fa Mon Sep 17 00:00:00 2001
-From: Iain Sandoe <iain at codesourcery.com>
-Date: Sun, 27 Jul 2014 20:35:16 +0100
-Subject: [PATCH 1001/1006] Default to ppc7400 for OSX 10.5+
-
----
- lib/Driver/Tools.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
-index db43fde..46956e7 100644
---- llvm_master/tools/clang/lib/Driver/Tools.cpp
-+++ macports_master/tools/clang/lib/Driver/Tools.cpp
-@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
- TargetCPUName = "ppc64";
- else if (T.getArch() == llvm::Triple::ppc64le)
- TargetCPUName = "ppc64le";
-+ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
-+ // For 10.5+ Altivec is assumed available.
-+ TargetCPUName = "7400";
- else
- TargetCPUName = "ppc";
- }
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,84 @@
+From 6fdbdc072ecd1eac579af61e5985cb935d02a52b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:50:24 -0800
+Subject: [PATCH 1001/1008] MacPorts Only: Prepare clang-format for replacement
+ with absolute path
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/clang-format/clang-format-bbedit.applescript | 2 +-
+ tools/clang-format/clang-format-diff.py | 2 +-
+ tools/clang-format/clang-format-sublime.py | 2 +-
+ tools/clang-format/clang-format.el | 3 +--
+ tools/clang-format/clang-format.py | 2 +-
+ 5 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+index fa88fe9..eb09448 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
++++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+@@ -15,7 +15,7 @@ tell application "BBEdit"
+ end tell
+
+ set filePath to urlToPOSIXPath(fileURL)
+-set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
++set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
+
+ tell application "BBEdit"
+ -- "set contents of text document 1 to newContents" scrolls to the bottom while
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+index 23adb07..063c5d2 100755
+--- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
+@@ -32,7 +32,7 @@ import sys
+
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+
+ def main():
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+index 16ff56e..4b68104 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
++++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
+
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
+index ab0991b..a2a278a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.el
++++ macports_master/tools/clang/tools/clang-format/clang-format.el
+@@ -36,8 +36,7 @@
+ :group 'tools)
+
+ (defcustom clang-format-executable
+- (or (executable-find "clang-format")
+- "clang-format")
++ "@CLANG_FORMAT_PATH@"
+ "Location of the clang-format executable.
+
+ A string containing the name or the full path of the executable."
+diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
+index a79205a..e71362a 100644
+--- llvm_master/tools/clang/tools/clang-format/clang-format.py
++++ macports_master/tools/clang/tools/clang-format/clang-format.py
+@@ -25,7 +25,7 @@ import vim
+
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
+
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,39 @@
+From 3a51db8fffb0298c927fb8a183d47392027bbbc6 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:51:10 -0800
+Subject: [PATCH 1002/1008] MacPorts Only: Fall back on xcodebuild -sdk when
+ xcrun --sdk is not supported
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index f06ef99..b0946ba 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
+ profile_osx.a \
+ ubsan_osx.a
+
+-IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
+-IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
++XCRunSdkPath = \
++ $(shell \
++ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
++ if [ "$$?" != "0" ]; then \
++ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
++ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
++ fi; \
++ if [ "$$?" != "0" ]; then result=""; fi; \
++ echo $$result)
++
++IOS_SDK := $(call XCRunSdkPath,iphoneos)
++IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
+
+ ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
+ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1002-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,84 +0,0 @@
-From d95bdf342037ee815fa21e871dd9479bc3572550 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:50:24 -0800
-Subject: [PATCH 1002/1006] MacPorts Only: Prepare clang-format for replacement
- with absolute path
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- tools/clang-format/clang-format-bbedit.applescript | 2 +-
- tools/clang-format/clang-format-diff.py | 2 +-
- tools/clang-format/clang-format-sublime.py | 2 +-
- tools/clang-format/clang-format.el | 3 +--
- tools/clang-format/clang-format.py | 2 +-
- 5 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-index fa88fe9..eb09448 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-+++ macports_master/tools/clang/tools/clang-format/clang-format-bbedit.applescript
-@@ -15,7 +15,7 @@ tell application "BBEdit"
- end tell
-
- set filePath to urlToPOSIXPath(fileURL)
--set newContents to do shell script "/path/to/clang-format -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-+set newContents to do shell script "@CLANG_FORMAT_PATH@ -offset=" & selectionOffset & " -length=" & selectionLength & " " & quoted form of filePath
-
- tell application "BBEdit"
- -- "set contents of text document 1 to newContents" scrolls to the bottom while
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-diff.py macports_master/tools/clang/tools/clang-format/clang-format-diff.py
-index 23adb07..063c5d2 100755
---- llvm_master/tools/clang/tools/clang-format/clang-format-diff.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
-@@ -32,7 +32,7 @@ import sys
-
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
-
- def main():
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
-index 16ff56e..4b68104 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format-sublime.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format-sublime.py
-@@ -18,7 +18,7 @@ import sublime_plugin
- import subprocess
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.el macports_master/tools/clang/tools/clang-format/clang-format.el
-index ab0991b..a2a278a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.el
-+++ macports_master/tools/clang/tools/clang-format/clang-format.el
-@@ -36,8 +36,7 @@
- :group 'tools)
-
- (defcustom clang-format-executable
-- (or (executable-find "clang-format")
-- "clang-format")
-+ "@CLANG_FORMAT_PATH@"
- "Location of the clang-format executable.
-
- A string containing the name or the full path of the executable."
-diff --git llvm_master/tools/clang/tools/clang-format/clang-format.py macports_master/tools/clang/tools/clang-format/clang-format.py
-index a79205a..e71362a 100644
---- llvm_master/tools/clang/tools/clang-format/clang-format.py
-+++ macports_master/tools/clang/tools/clang-format/clang-format.py
-@@ -25,7 +25,7 @@ import vim
-
- # set g:clang_format_path to the path to clang-format if it is not on the path
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
- if vim.eval('exists("g:clang_format_path")') == "1":
- binary = vim.eval('g:clang_format_path')
-
---
-2.2.2
-
Deleted: trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,39 +0,0 @@
-From c69389a9ad48948076d754f99b94fbf797ea01fd Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:51:10 -0800
-Subject: [PATCH 1003/1006] MacPorts Only: Fall back on xcodebuild -sdk when
- xcrun --sdk is not supported
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- runtime/compiler-rt/Makefile | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index f06ef99..b0946ba 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -81,8 +81,18 @@ RuntimeLibrary.darwin.Configs := \
- profile_osx.a \
- ubsan_osx.a
-
--IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
--IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)
-+XCRunSdkPath = \
-+ $(shell \
-+ result=`xcrun --sdk $(1) --show-sdk-path 2> /dev/null`; \
-+ if [ "$$?" != "0" ]; then \
-+ result=`xcodebuild -sdk $(1) -version 2> /dev/null \
-+ | sed -n 's/^Path: \(..*\)$$/\1/p'`; \
-+ fi; \
-+ if [ "$$?" != "0" ]; then result=""; fi; \
-+ echo $$result)
-+
-+IOS_SDK := $(call XCRunSdkPath,iphoneos)
-+IOSSIM_SDK := $(call XCRunSdkPath,iphonesimulator)
-
- ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
- RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,29 @@
+From 95d6351d09e6ed8b288d0801ee9c8970477fdb57 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:55:27 -0800
+Subject: [PATCH 1003/1008] MacPorts Only: Fix name of scan-view executable
+ inside scan-build
+
+http://trac.macports.org/ticket/35006
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/scan-build/scan-build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
+index d52d8f5..2a3d1db 100755
+--- llvm_master/tools/clang/tools/scan-build/scan-build
++++ macports_master/tools/clang/tools/scan-build/scan-build
+@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
+ Diag "Analysis run complete.\n";
+ Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
+ my $ScanView = Cwd::realpath("$RealBin/scan-view");
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
++ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
+ if (! -x $ScanView) { $ScanView = "scan-view"; }
+ exec $ScanView, "$HtmlDir";
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,27 @@
+From 3459ae4f0909a6ab1fb5df79db042609b56a9231 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:56:44 -0800
+Subject: [PATCH 1004/1008] MacPorts Only: Fix libclang_rt dylib ids
+
+We should probably not be shipping these.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ runtime/compiler-rt/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index b0946ba..5549038 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
+ $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
+ $(Echo) Installing compiler runtime library: $1/$$*
+ $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
++ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
+
+ # Rule to install runtime libraries.
+ RuntimeLibraryInstall.$1: \
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1004-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,29 +0,0 @@
-From cf37a2cc4435f757228e928f5fbfb6cadd1b2e21 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:55:27 -0800
-Subject: [PATCH 1004/1006] MacPorts Only: Fix name of scan-view executable
- inside scan-build
-
-http://trac.macports.org/ticket/35006
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- tools/scan-build/scan-build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git llvm_master/tools/clang/tools/scan-build/scan-build macports_master/tools/clang/tools/scan-build/scan-build
-index d52d8f5..2a3d1db 100755
---- llvm_master/tools/clang/tools/scan-build/scan-build
-+++ macports_master/tools/clang/tools/scan-build/scan-build
-@@ -1728,6 +1728,8 @@ if (defined $OutputFormat) {
- Diag "Analysis run complete.\n";
- Diag "Viewing analysis results in '$HtmlDir' using scan-view.\n";
- my $ScanView = Cwd::realpath("$RealBin/scan-view");
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }
-+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }
- if (! -x $ScanView) { $ScanView = "scan-view"; }
- exec $ScanView, "$HtmlDir";
- }
---
-2.2.2
-
Deleted: trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Fix-libclang_rt-dylib-ids.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,27 +0,0 @@
-From 1e79aa1d2d652fe79c244c185eeff76c2e40caf2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:56:44 -0800
-Subject: [PATCH 1005/1006] MacPorts Only: Fix libclang_rt dylib ids
-
-We should probably not be shipping these.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- runtime/compiler-rt/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index b0946ba..5549038 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -244,6 +244,7 @@ $(PROJ_resources_lib)/$1/libclang_rt.%.dylib: \
- $(ResourceLibDir)/$1/libclang_rt.%.dylib | $(PROJ_resources_lib)/$1
- $(Echo) Installing compiler runtime library: $1/$$*
- $(Verb) $(DataInstall) $$< $(PROJ_resources_lib)/$1
-+ $(Verb) install_name_tool $$@ -id $$(patsubst $(DESTDIR)%,%,$$@)
-
- # Rule to install runtime libraries.
- RuntimeLibraryInstall.$1: \
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1005-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,74 @@
+From 2984534bbb28860bef27168878a91cead3474cb3 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 17:58:25 -0800
+Subject: [PATCH 1005/1008] MacPorts Only: Relocate clang resources using llvm
+ version
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Headers/Makefile | 3 ++-
+ runtime/compiler-rt/Makefile | 15 ++++++++++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
+index 903acac..7c37992 100644
+--- llvm_master/tools/clang/lib/Headers/Makefile
++++ macports_master/tools/clang/lib/Headers/Makefile
+@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
+
+@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
+ # Hook into the standard Makefile rules.
+ all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
+
+-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
++PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
+
+ INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
+ INSTHEADERS += $(PROJ_headers)/arm_neon.h
+diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
+index 5549038..50f0a81 100644
+--- llvm_master/tools/clang/runtime/compiler-rt/Makefile
++++ macports_master/tools/clang/runtime/compiler-rt/Makefile
+@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
+
+ CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+ $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
++LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
+
+ ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
+-PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
++PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
+
+ ResourceLibDir := $(ResourceDir)/lib
+ ResourceIncludeDir := $(ResourceDir)/include
+@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
+ RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
+ .PHONY: RuntimeHeaderInstall
+
++# Make sure $(PROJ_resources) exists before creating the symlink.
++$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
++ $(Echo) Creating compiler runtime compatibility symlink
++ $(Verb) $(MKDIR) $(dir $@)
++ $(Verb) ln -s $(LLVM_VERSION) $@
++
++MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
++.PHONY: MacPortsClangResSymlinkInstall
++
+ # Hook into the standard Makefile rules.
+ all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
+ install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
++ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
++install-local:: MacPortsClangResSymlinkInstall
++endif
+ clean-local:: CleanRuntimeLibraries
+
+ endif
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1006-Default-to-ppc7400-for-OSX-10.5.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,26 @@
+From 07ba2946e8edd7dd65126fa5108c14474a916f34 Mon Sep 17 00:00:00 2001
+From: Iain Sandoe <iain at codesourcery.com>
+Date: Sun, 27 Jul 2014 20:35:16 +0100
+Subject: [PATCH 1006/1008] Default to ppc7400 for OSX 10.5+
+
+---
+ lib/Driver/Tools.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
+index db43fde..46956e7 100644
+--- llvm_master/tools/clang/lib/Driver/Tools.cpp
++++ macports_master/tools/clang/lib/Driver/Tools.cpp
+@@ -1499,6 +1499,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T) {
+ TargetCPUName = "ppc64";
+ else if (T.getArch() == llvm::Triple::ppc64le)
+ TargetCPUName = "ppc64le";
++ else if (T.isOSDarwin() && !T.isMacOSXVersionLT(10,5))
++ // For 10.5+ Altivec is assumed available.
++ TargetCPUName = "7400";
+ else
+ TargetCPUName = "ppc";
+ }
+--
+2.2.2
+
Deleted: trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 07:21:11 UTC (rev 131932)
+++ trunk/dports/lang/llvm-3.7/files/1006-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -1,74 +0,0 @@
-From 0111fcf6f32dfeb41ae0b1e9be0258b899d97200 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 17 Jan 2015 17:58:25 -0800
-Subject: [PATCH 1006/1006] MacPorts Only: Relocate clang resources using llvm
- version
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/Headers/Makefile | 3 ++-
- runtime/compiler-rt/Makefile | 15 ++++++++++++++-
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git llvm_master/tools/clang/lib/Headers/Makefile macports_master/tools/clang/lib/Headers/Makefile
-index 903acac..7c37992 100644
---- llvm_master/tools/clang/lib/Headers/Makefile
-+++ macports_master/tools/clang/lib/Headers/Makefile
-@@ -16,6 +16,7 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
-
-@@ -40,7 +41,7 @@ $(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.di
- # Hook into the standard Makefile rules.
- all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
-
--PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
-+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)/include
-
- INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
- INSTHEADERS += $(PROJ_headers)/arm_neon.h
-diff --git llvm_master/tools/clang/runtime/compiler-rt/Makefile macports_master/tools/clang/runtime/compiler-rt/Makefile
-index 5549038..50f0a81 100644
---- llvm_master/tools/clang/runtime/compiler-rt/Makefile
-+++ macports_master/tools/clang/runtime/compiler-rt/Makefile
-@@ -18,9 +18,10 @@ include $(CLANG_LEVEL)/Makefile
-
- CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
- $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
-+LLVM_VERSION := $(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR)
-
- ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
--PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
-+PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(LLVM_VERSION)
-
- ResourceLibDir := $(ResourceDir)/lib
- ResourceIncludeDir := $(ResourceDir)/include
-@@ -265,9 +266,21 @@ $(PROJ_resources_include)/sanitizer: $(ResourceIncludeDir)/sanitizer $(PROJ_reso
- RuntimeHeaderInstall: $(PROJ_resources_include)/sanitizer
- .PHONY: RuntimeHeaderInstall
-
-+# Make sure $(PROJ_resources) exists before creating the symlink.
-+$(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION)):
-+ $(Echo) Creating compiler runtime compatibility symlink
-+ $(Verb) $(MKDIR) $(dir $@)
-+ $(Verb) ln -s $(LLVM_VERSION) $@
-+
-+MacPortsClangResSymlinkInstall: $(PROJ_resources:$(LLVM_VERSION)=$(CLANG_VERSION))
-+.PHONY: MacPortsClangResSymlinkInstall
-+
- # Hook into the standard Makefile rules.
- all-local:: $(RuntimeDirs:%=RuntimeLibrary.%) RuntimeHeader
- install-local:: $(RuntimeDirs:%=RuntimeLibraryInstall.%) RuntimeHeaderInstall
-+ifneq ($(LLVM_VERSION),$(CLANG_VERSION))
-+install-local:: MacPortsClangResSymlinkInstall
-+endif
- clean-local:: CleanRuntimeLibraries
-
- endif
---
-2.2.2
-
Added: trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1007-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,29 @@
+From a98b6c303f44aa9f55c766aab1db65873a4e9c71 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 17 Jan 2015 19:08:57 -0800
+Subject: [PATCH 1007/1008] Only call setpriority(PRIO_DARWIN_THREAD, 0,
+ PRIO_DARWIN_BG) if it is available
+
+Tiger and earlier versions of darwin do not support this.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ tools/libclang/CIndex.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git llvm_master/tools/clang/tools/libclang/CIndex.cpp macports_master/tools/clang/tools/libclang/CIndex.cpp
+index 00ef8c0..6f124be 100644
+--- llvm_master/tools/clang/tools/libclang/CIndex.cpp
++++ macports_master/tools/clang/tools/libclang/CIndex.cpp
+@@ -7044,7 +7044,7 @@ void clang::setThreadBackgroundPriority() {
+ if (getenv("LIBCLANG_BGPRIO_DISABLE"))
+ return;
+
+-#ifdef USE_DARWIN_THREADS
++#if defined(USE_DARWIN_THREADS) && defined(PRIO_DARWIN_THREAD) && defined(PRIO_DARWIN_BG)
+ setpriority(PRIO_DARWIN_THREAD, 0, PRIO_DARWIN_BG);
+ #endif
+ }
+--
+2.2.2
+
Added: trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch (rev 0)
+++ trunk/dports/lang/llvm-3.7/files/1008-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-01-21 08:52:11 UTC (rev 131933)
@@ -0,0 +1,31 @@
+From 4f54947c85c0b54d17577d5387d0b01068bb4f80 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 20 Jan 2015 00:09:16 -0800
+Subject: [PATCH 1008/1008] Default to fragile ObjC runtime when targeting
+ darwin/ppc
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ lib/Driver/ToolChains.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git llvm_master/tools/clang/lib/Driver/ToolChains.h macports_master/tools/clang/lib/Driver/ToolChains.h
+index 47fb10d..80535f5 100644
+--- llvm_master/tools/clang/lib/Driver/ToolChains.h
++++ macports_master/tools/clang/lib/Driver/ToolChains.h
+@@ -273,8 +273,10 @@ public:
+ }
+
+ bool IsObjCNonFragileABIDefault() const override {
+- // Non-fragile ABI is default for everything but i386.
+- return getTriple().getArch() != llvm::Triple::x86;
++ // Non-fragile ABI is default for legacy architectures
++ return getTriple().getArch() != llvm::Triple::x86 &&
++ getTriple().getArch() != llvm::Triple::ppc &&
++ getTriple().getArch() != llvm::Triple::ppc64;
+ }
+
+ bool UseObjCMixedDispatch() const override {
+--
+2.2.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150121/befe255d/attachment-0001.html>
More information about the macports-changes
mailing list