[142799] trunk/dports/lang/llvm-3.8
jeremyhu at macports.org
jeremyhu at macports.org
Sat Dec 12 07:17:06 PST 2015
Revision: 142799
https://trac.macports.org/changeset/142799
Author: jeremyhu at macports.org
Date: 2015-11-23 16:04:47 -0800 (Mon, 23 Nov 2015)
Log Message:
-----------
llvm-3.8: Bump to r253905
Revision Links:
--------------
https://trac.macports.org/changeset/253905
Modified Paths:
--------------
trunk/dports/lang/llvm-3.8/Portfile
trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
Removed Paths:
-------------
trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch
trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch
trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch
Modified: trunk/dports/lang/llvm-3.8/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.8/Portfile 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/Portfile 2015-11-24 00:04:47 UTC (rev 142799)
@@ -64,7 +64,7 @@
}
fetch.type svn
-svn.revision 252441
+svn.revision 253905
set compiler_rt_rev ${svn.revision}
set libcxx_rev ${svn.revision}
@@ -119,9 +119,6 @@
2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch \
2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch \
2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch \
- 2007-Add-internal_strlcat-and-internal_strlcpy.patch \
- 2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch \
- 2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch \
3001-buildit-build-fix-for-Leopard.patch \
3002-buildit-Set-compatibility-version-to-RC_ProjectSourc.patch \
3003-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
@@ -160,7 +157,7 @@
select.group clang
select.file ${filespath}/mp-${subport}
- configure.args-append --with-python=${prefix}/bin/python2.7
+ configure.args-append --with-python=${prefix}/bin/python2.7 --disable-clang-static-analyzer
}
# llvm-3.5 and later requires a C++11 runtime
@@ -347,16 +344,19 @@
}
variant analyzer description {Install clang static analyzer} {
+ configure.args-delete --disable-clang-static-analyzer
+ configure.args-append --enable-clang-static-analyzer
+
depends_run-append port:perl5
post-patch {
reinplace "s|/usr/bin/env perl|${prefix}/bin/perl5|g" \
- ${worksrcpath}/tools/clang/tools/scan-build/ccc-analyzer \
- ${worksrcpath}/tools/clang/tools/scan-build/c++-analyzer \
- ${worksrcpath}/tools/clang/tools/scan-build/scan-build
+ ${worksrcpath}/tools/clang/tools/scan-build/libexec/ccc-analyzer \
+ ${worksrcpath}/tools/clang/tools/scan-build/libexec/c++-analyzer \
+ ${worksrcpath}/tools/clang/tools/scan-build/bin/scan-build
reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
- ${worksrcpath}/tools/clang/tools/scan-build/set-xcode-analyzer \
- ${worksrcpath}/tools/clang/tools/scan-view/scan-view
+ ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
+ ${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
}
post-destroot {
@@ -364,14 +364,10 @@
file copy ${worksrcpath}/tools/clang/tools/scan-build ${destroot}${sub_prefix}/libexec/scan-build
file copy ${worksrcpath}/tools/clang/tools/scan-view ${destroot}${sub_prefix}/libexec/scan-view
- file delete -force ${destroot}${sub_prefix}/libexec/scan-build/.svn
- file delete -force ${destroot}${sub_prefix}/libexec/scan-view/.svn
- file delete -force ${destroot}${sub_prefix}/libexec/scan-view/Resources/.svn
+ ln -s ${sub_prefix}/libexec/scan-build/bin/scan-build ${destroot}${sub_prefix}/bin/scan-build
+ ln -s ${sub_prefix}/libexec/scan-view/bin/scan-view ${destroot}${sub_prefix}/bin/scan-view
+ ln -s ${sub_prefix}/bin/clang ${destroot}${sub_prefix}/libexec/scan-build/bin/clang
- ln -s ${sub_prefix}/libexec/scan-build/scan-build ${destroot}${sub_prefix}/bin/scan-build
- ln -s ${sub_prefix}/libexec/scan-view/scan-view ${destroot}${sub_prefix}/bin/scan-view
- ln -s ${sub_prefix}/bin ${destroot}${sub_prefix}/libexec/scan-build/bin
-
xinstall -m 755 "${filespath}/llvm-bin" "${destroot}${prefix}/bin/scan-build-${suffix}"
reinplace "s:EXEC_PATH:${sub_prefix}/bin/scan-build:" "${destroot}${prefix}/bin/scan-build-${suffix}"
Modified: trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From aaeb3eaf62090252c79e3c28ac2a7265cda1322a Mon Sep 17 00:00:00 2001
+From 7dbc94035eaddc6140e9d868bca254288e101078 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/1007] MacPorts Only: Prepare clang-format for replacement
@@ -40,7 +40,7 @@
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 1cffcec..5c90704 100644
+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
@@ -53,7 +53,7 @@
# 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 6de45de..523c012 100644
+index ca46144..1c49835 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 @@
@@ -67,7 +67,7 @@
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 1725e86..b88e64b 100644
+index 5cb41fc..e8a5904 100644
--- llvm_master/tools/clang/tools/clang-format/clang-format.py
+++ macports_master/tools/clang/tools/clang-format/clang-format.py
@@ -34,7 +34,7 @@ import vim
Modified: trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1002-MacPorts-Only-Fall-back-on-xcodebuild-sdk-when-xcrun.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From 0c55d7ac5fa11a79d49490fc67161a4045365a79 Mon Sep 17 00:00:00 2001
+From 6327a2a1206a17c82391beb82a528e685b2d7cac 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/1007] MacPorts Only: Fall back on xcodebuild -sdk when
Modified: trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1003-MacPorts-Only-Fix-name-of-scan-view-executable-insid.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From 989de293fb54402977057d1b25672e6b2b588b98 Mon Sep 17 00:00:00 2001
+From 2a763d1dca2bf4967aef146bf75f3fea72820b0d 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/1007] MacPorts Only: Fix name of scan-view executable
@@ -8,22 +8,22 @@
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
- tools/scan-build/scan-build | 2 ++
+ tools/scan-build/bin/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 24796c7..a7731f8 100755
---- llvm_master/tools/clang/tools/scan-build/scan-build
-+++ macports_master/tools/clang/tools/scan-build/scan-build
-@@ -1815,6 +1815,8 @@ if (defined $Options{OutputFormat}) {
+diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build
+index 6a14484..319305f 100755
+--- llvm_master/tools/clang/tools/scan-build/bin/scan-build
++++ macports_master/tools/clang/tools/scan-build/bin/scan-build
+@@ -1817,6 +1817,8 @@ if (defined $Options{OutputFormat}) {
Diag "Analysis run complete.\n";
Diag "Viewing analysis results in '$Options{OutputDir}' 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"; }
+ if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); }
exec $ScanView, "$Options{OutputDir}";
- }
--
2.6.2
Modified: trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1004-MacPorts-Only-Relocate-clang-resources-using-llvm-ve.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From cf0f7ad6f095dce9c179dbac78d638e3c95ce206 Mon Sep 17 00:00:00 2001
+From 0584af98c60ffbf7f9495d5e917647407b3bcd5d 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/1007] MacPorts Only: Relocate clang resources using llvm
Modified: trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1005-Default-to-ppc7400-for-OSX-10.5.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From d2106a67550412ec070e8b6470848fcffb6fde08 Mon Sep 17 00:00:00 2001
+From f787fe18be52154ebf95db36df01192f2f779733 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 1005/1007] Default to ppc7400 for OSX 10.5+
@@ -8,10 +8,10 @@
1 file changed, 3 insertions(+)
diff --git llvm_master/tools/clang/lib/Driver/Tools.cpp macports_master/tools/clang/lib/Driver/Tools.cpp
-index 03d4c6b..d3ba38d 100644
+index 3bd2ffb..76cc5a0 100644
--- llvm_master/tools/clang/lib/Driver/Tools.cpp
+++ macports_master/tools/clang/lib/Driver/Tools.cpp
-@@ -1621,6 +1621,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
+@@ -1700,6 +1700,9 @@ static std::string getCPUName(const ArgList &Args, const llvm::Triple &T,
TargetCPUName = "ppc64";
else if (T.getArch() == llvm::Triple::ppc64le)
TargetCPUName = "ppc64le";
Modified: trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From 598808c8e95f6b4ec744dbc01678bb06067635e3 Mon Sep 17 00:00:00 2001
+From dd396124cc450c06fb7a34df4184375a7785ef98 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 1006/1007] Only call setpriority(PRIO_DARWIN_THREAD, 0,
@@ -12,10 +12,10 @@
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 ac6f98d..c068f3b 100644
+index 589e39e..c10ce43 100644
--- llvm_master/tools/clang/tools/libclang/CIndex.cpp
+++ macports_master/tools/clang/tools/libclang/CIndex.cpp
-@@ -7208,7 +7208,7 @@ void clang::setThreadBackgroundPriority() {
+@@ -7321,7 +7321,7 @@ void clang::setThreadBackgroundPriority() {
if (getenv("LIBCLANG_BGPRIO_DISABLE"))
return;
Modified: trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/1007-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,4 +1,4 @@
-From 59eb83d2f52133802905ff87cedcd7d10a864e1f Mon Sep 17 00:00:00 2001
+From 6ebfe70568d76cf4bb4c42cca2d22d66c04a310b 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 1007/1007] Default to fragile ObjC runtime when targeting
@@ -10,10 +10,10 @@
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 7743378..970efdb 100644
+index fc656af..f9ac275 100644
--- llvm_master/tools/clang/lib/Driver/ToolChains.h
+++ macports_master/tools/clang/lib/Driver/ToolChains.h
-@@ -317,8 +317,10 @@ public:
+@@ -321,8 +321,10 @@ public:
bool IsEncodeExtendedBlockSignatureDefault() const override { return true; }
bool IsObjCNonFragileABIDefault() const override {
Modified: trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2001-MacPorts-Only-Comment-out-SL-cctools-workaround.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From 12bfbb3d727b327eae4537e58630b3b315ac9ad1 Mon Sep 17 00:00:00 2001
+From 50fb9417b3c687ee774bbce476665c294694f8aa Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon, 15 Apr 2013 22:38:18 -0700
-Subject: [PATCH 2001/2009] MacPorts Only: Comment out SL cctools workaround
+Subject: [PATCH 2001/2006] MacPorts Only: Comment out SL cctools workaround
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
---
@@ -9,7 +9,7 @@
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index dff2694..ec61b45 100644
+index f85ced5..62b6f92 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -125,11 +125,11 @@ UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_ioss
Modified: trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2002-Update-CheckArches-to-fallback-on-Intel-ppc-if-ld-v-.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From 2def671886c29b75b57706f1b5219d4369415d58 Mon Sep 17 00:00:00 2001
+From 59e78b2ee11d1f17dbc8375a9b19e042d4726805 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 10 Jan 2015 03:34:51 -0800
-Subject: [PATCH 2002/2009] Update CheckArches to fallback on Intel/ppc if ld
+Subject: [PATCH 2002/2006] Update CheckArches to fallback on Intel/ppc if ld
-v doesn't report supported architectures
Older versions of ld64 (eg: Xcode 3.x) do not report this.
@@ -14,7 +14,7 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index ec61b45..23a0b38 100644
+index 62b6f92..e8b8ced 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -17,8 +17,7 @@ CheckArches = \
Modified: trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2003-Fall-back-on-xcodebuild-sdk-when-xcrun-sdk-is-not-su.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From 963da700c153dacb5427731f237b8a0cef293d32 Mon Sep 17 00:00:00 2001
+From 88513020c3551b89e0b0fd5d72632dc5cff68794 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 17:45:27 -0800
-Subject: [PATCH 2003/2009] Fall back on xcodebuild -sdk when xcrun --sdk is
+Subject: [PATCH 2003/2006] Fall back on xcodebuild -sdk when xcrun --sdk is
not supported
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -10,7 +10,7 @@
1 file changed, 4 insertions(+)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 23a0b38..026037d 100644
+index e8b8ced..4f25a55 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -49,6 +49,10 @@ XCRunSdkPath = \
Modified: trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2004-On-darwin-build-ppc-slices-of-the-compiler-runtime-i.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From 8ce0328a4f41b9441500b743f567c583a93c7afc Mon Sep 17 00:00:00 2001
+From c60d1653bc6cb8d3f79cb5054a1024f06363174d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 17 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2004/2009] On darwin, build ppc slices of the compiler runtime
+Subject: [PATCH 2004/2006] On darwin, build ppc slices of the compiler runtime
if requested and supported by the SDK and toolchain
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -10,7 +10,7 @@
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 026037d..7176e37 100644
+index 4f25a55..3f683e9 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -80,10 +80,10 @@ Configs += eprintf
Modified: trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2005-MacPorts-Only-Don-t-build-x86_64h-slice-of-compiler-.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From 967c9eb2c1c2653e407b4f23cc28897abdd90a17 Mon Sep 17 00:00:00 2001
+From a5e3429759eb0f15bbd576d6c96355ea72378fd9 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed, 14 Jan 2015 19:55:19 -0800
-Subject: [PATCH 2005/2009] MacPorts Only: Don't build x86_64h slice of
+Subject: [PATCH 2005/2006] MacPorts Only: Don't build x86_64h slice of
compiler-rt
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
@@ -10,7 +10,7 @@
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 7176e37..8200c8a 100644
+index 3f683e9..62116a9 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -94,11 +94,11 @@ UniversalArchs.ios += $(call CheckArches,armv7 arm64,ios,$(IOS_SDK))
Modified: trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2006-MacPorts-Only-Fix-regression-introduced-when-fixing-.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,7 +1,7 @@
-From bf448eb9a3c7393463bbafc7d31ae841feae9473 Mon Sep 17 00:00:00 2001
+From fadf6c4a22a7d8a6a99acb05175669b68b8b317b Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun, 11 Oct 2015 09:02:26 -0700
-Subject: [PATCH 2006/2009] MacPorts Only: Fix regression introduced when
+Subject: [PATCH 2006/2006] MacPorts Only: Fix regression introduced when
fixing PR24776
Partially reverts commit efecb2c285bd444b6def43ac62e5f0278df387eb
@@ -12,7 +12,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
-index 8200c8a..a634a3f 100644
+index 62116a9..6cc3e53 100644
--- llvm_master/projects/compiler-rt/make/platform/clang_darwin.mk
+++ macports_master/projects/compiler-rt/make/platform/clang_darwin.mk
@@ -18,7 +18,7 @@ CheckArches = \
Deleted: trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2007-Add-internal_strlcat-and-internal_strlcpy.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,71 +0,0 @@
-From a794fa173577559a2c307b3637042729b38a496b Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Thu, 29 Oct 2015 09:36:42 -0700
-Subject: [PATCH 2007/2009] Add internal_strlcat and internal_strlcpy
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
----
- lib/sanitizer_common/sanitizer_libc.cc | 24 ++++++++++++++++++++++++
- lib/sanitizer_common/sanitizer_libc.h | 2 ++
- 2 files changed, 26 insertions(+)
-
-diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
-index 43e4546..d346350 100644
---- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
-+++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.cc
-@@ -175,6 +175,19 @@ uptr internal_strlen(const char *s) {
- return i;
- }
-
-+uptr internal_strlcat(char *dst, const char *src, uptr maxlen) {
-+ const uptr srclen = internal_strlen(src);
-+ const uptr dstlen = internal_strnlen(dst, maxlen);
-+ if (dstlen == maxlen) return maxlen+srclen;
-+ if (srclen < maxlen-dstlen) {
-+ internal_memcpy(dst+dstlen, src, srclen+1);
-+ } else {
-+ internal_memcpy(dst+dstlen, src, maxlen-dstlen-1);
-+ dst[maxlen-1] = '\0';
-+ }
-+ return dstlen + srclen;
-+}
-+
- char *internal_strncat(char *dst, const char *src, uptr n) {
- uptr len = internal_strlen(dst);
- uptr i;
-@@ -184,6 +197,17 @@ char *internal_strncat(char *dst, const char *src, uptr n) {
- return dst;
- }
-
-+uptr internal_strlcpy(char *dst, const char *src, uptr maxlen) {
-+ const uptr srclen = internal_strlen(src);
-+ if (srclen < maxlen) {
-+ internal_memcpy(dst, src, srclen+1);
-+ } else if (maxlen != 0) {
-+ internal_memcpy(dst, src, maxlen-1);
-+ dst[maxlen-1] = '\0';
-+ }
-+ return srclen;
-+}
-+
- char *internal_strncpy(char *dst, const char *src, uptr n) {
- uptr i;
- for (i = 0; i < n && src[i]; i++)
-diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.h macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
-index 99de140..df28677 100644
---- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
-+++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_libc.h
-@@ -43,8 +43,10 @@ uptr internal_strcspn(const char *s, const char *reject);
- char *internal_strdup(const char *s);
- char *internal_strndup(const char *s, uptr n);
- uptr internal_strlen(const char *s);
-+uptr internal_strlcat(char *dst, const char *src, uptr maxlen);
- char *internal_strncat(char *dst, const char *src, uptr n);
- int internal_strncmp(const char *s1, const char *s2, uptr n);
-+uptr internal_strlcpy(char *dst, const char *src, uptr maxlen);
- char *internal_strncpy(char *dst, const char *src, uptr n);
- uptr internal_strnlen(const char *s, uptr maxlen);
- char *internal_strrchr(const char *s, int c);
---
-2.6.2
-
Deleted: trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2008-cherry-pick-RemoveANSIEscapeSequencesFromString-from.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,73 +0,0 @@
-From ea31f59f9ca1522479010f0cf62897a601b29a8a Mon Sep 17 00:00:00 2001
-From: Anna Zaks <ganna at apple.com>
-Date: Thu, 29 Oct 2015 09:56:12 -0700
-Subject: [PATCH 2008/2009] cherry-pick RemoveANSIEscapeSequencesFromString
- from master
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 40a6da60a1a29ef72a2f89eb42ea9543b295bc81)
----
- lib/sanitizer_common/sanitizer_common.cc | 34 ++++++++++++++++++++++++++++++++
- lib/sanitizer_common/sanitizer_common.h | 1 +
- 2 files changed, 35 insertions(+)
-
-diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
-index b40a457..ba9779b 100644
---- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
-+++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc
-@@ -295,6 +295,40 @@ void ReportErrorSummary(const char *error_type, const AddressInfo &info) {
- }
- #endif
-
-+// Removes the ANSI escape sequences from the input string (in-place).
-+void RemoveANSIEscapeSequencesFromString(char *str) {
-+ if (!str)
-+ return;
-+
-+ // We are going to remove the escape sequences in place.
-+ char *s = str;
-+ char *z = str;
-+ while (*s != '\0') {
-+ CHECK_GE(s, z);
-+ // Skip over ANSI escape sequences with pointer 's'.
-+ if (*s == '\033' && *(s + 1) == '[') {
-+ s = internal_strchrnul(s, 'm');
-+ if (*s == '\0') {
-+ break;
-+ }
-+ s++;
-+ continue;
-+ }
-+ // 's' now points at a character we want to keep. Copy over the buffer
-+ // content if the escape sequence has been perviously skipped andadvance
-+ // both pointers.
-+ if (s != z)
-+ *z = *s;
-+
-+ // If we have not seen an escape sequence, just advance both pointers.
-+ z++;
-+ s++;
-+ }
-+
-+ // Null terminate the string.
-+ *z = '\0';
-+}
-+
- void LoadedModule::set(const char *module_name, uptr base_address) {
- clear();
- full_name_ = internal_strdup(module_name);
-diff --git llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
-index 43cd2d0..7cc7ac3 100644
---- llvm_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
-+++ macports_master/projects/compiler-rt/lib/sanitizer_common/sanitizer_common.h
-@@ -162,6 +162,7 @@ void SetLowLevelAllocateCallback(LowLevelAllocateCallback callback);
- // IO
- void RawWrite(const char *buffer);
- bool ColorizeReports();
-+void RemoveANSIEscapeSequencesFromString(char *buffer);
- void Printf(const char *format, ...);
- void Report(const char *format, ...);
- void SetPrintfAndReportCallback(void (*callback)(const char *));
---
-2.6.2
-
Deleted: trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch
===================================================================
--- trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-11-23 19:53:13 UTC (rev 142798)
+++ trunk/dports/lang/llvm-3.8/files/2009-Save-the-ASan-report-in-the-OS-X-crash-log.patch 2015-11-24 00:04:47 UTC (rev 142799)
@@ -1,65 +0,0 @@
-From bcad97029ddda936676a23f9376e3d4c0d096cca Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sun, 25 Oct 2015 16:03:00 -0700
-Subject: [PATCH 2009/2009] Save the ASan report in the OS X crash log
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-(cherry picked from commit 2e0c223fc908606106fa5e87cb36d17d06663a4e)
----
- lib/asan/asan_report.cc | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git llvm_master/projects/compiler-rt/lib/asan/asan_report.cc macports_master/projects/compiler-rt/lib/asan/asan_report.cc
-index 957ac14..920fbc7 100644
---- llvm_master/projects/compiler-rt/lib/asan/asan_report.cc
-+++ macports_master/projects/compiler-rt/lib/asan/asan_report.cc
-@@ -24,6 +24,14 @@
- #include "sanitizer_common/sanitizer_stackdepot.h"
- #include "sanitizer_common/sanitizer_symbolizer.h"
-
-+// Apple CrashReporter support.
-+#ifdef __APPLE__
-+extern "C" {
-+static char *__crashreporter_info__ __attribute__((__used__)) = 0;
-+asm (".desc ___crashreporter_info__, 0x10");
-+}
-+#endif
-+
- namespace __asan {
-
- // -------------------- User-specified callbacks ----------------- {{{1
-@@ -46,6 +54,16 @@ static bool report_happened = false;
- static ReportData report_data = {};
-
- void AppendToErrorMessageBuffer(const char *buffer) {
-+#if __APPLE__
-+ // For the Apple CrashReporter support: Always store reports into buffer.
-+ if (!error_message_buffer) {
-+ error_message_buffer_size = 1 << 16;
-+ error_message_buffer =
-+ (char*)MmapOrDie(error_message_buffer_size, __func__);
-+ error_message_buffer_pos = 0;
-+ }
-+#endif
-+
- if (error_message_buffer) {
- uptr length = internal_strlen(buffer);
- CHECK_GE(error_message_buffer_size, error_message_buffer_pos);
-@@ -664,6 +682,14 @@ class ScopedInErrorReport {
- // Print memory stats.
- if (flags()->print_stats)
- __asan_print_accumulated_stats();
-+
-+#ifdef __APPLE__
-+ if (common_flags()->abort_on_error) {
-+ __crashreporter_info__ = internal_strdup(error_message_buffer);
-+ RemoveANSIEscapeSequencesFromString(__crashreporter_info__);
-+ }
-+#endif
-+
- if (error_report_callback) {
- error_report_callback(error_message_buffer);
- }
---
-2.6.2
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/53822503/attachment-0001.html>
More information about the macports-changes
mailing list