<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fd3774bdcaa518de79bfe8ec397d4833fb41af81">https://github.com/macports/macports-ports/commit/fd3774bdcaa518de79bfe8ec397d4833fb41af81</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fd3774b clang-devel: fix broken patch file
</span>fd3774b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fd3774bdcaa518de79bfe8ec397d4833fb41af81
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Jul 10 09:24:51 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang-devel: fix broken patch file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump because the port either builds correctly or not at all.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/58694
</span>---
lang/llvm-devel/files/9001-macports-libstdcxx.diff | 33 +++++++++++++++++-----
1 file changed, 26 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/9001-macports-libstdcxx.diff b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a5f6ad8..9d9154e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,26 @@
</span> enum RuntimeLibType {
--- orig/tools/clang/lib/Driver/ToolChains/Darwin.cpp
+++ new/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1953,10 +1953,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1921,8 +1921,9 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXStdlibType Type = GetCXXStdlibType(DriverArgs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- switch (GetCXXStdlibType(DriverArgs)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch (Type) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libcxx: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // On Darwin, libc++ is installed alongside the compiler in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // include/c++/v1, so get from '<install>/bin' to '<install>/include/c++/v1'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1943,6 +1944,7 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ToolChain::CST_Libstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ToolChain::CST_MacPortsLibstdcxx:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm::SmallString<128> UsrIncludeCxx = Sysroot;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ llvm::sys::path::append(UsrIncludeCxx, "usr", "include", "c++");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1953,10 +1955,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span>
case llvm::Triple::ppc:
case llvm::Triple::ppc64:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +77,8 @@
</span> - "powerpc-apple-darwin10",
- arch == llvm::Triple::ppc64 ? "ppc64" : "");
+ IsBaseFound = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (HSOpts.UseMacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, "@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Type==ToolChain::CST_MacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, llvm::StringRef("@@MACPORTS_GCC_INCLUDE_DIR@@"),
</span> + "",
+ "@@MACPORTS_HOST_NAME@@",
+ arch == llvm::Triple::ppc64 ? "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@" : "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +90,7 @@
</span> IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
"4.0.0", "powerpc-apple-darwin8",
arch == llvm::Triple::ppc64 ? "ppc64" : "");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1964,10 +1971,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1964,10 +1973,17 @@ void DarwinClang::AddClangCXXStdlibInclu
</span>
case llvm::Triple::x86:
case llvm::Triple::x86_64:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,8 +99,8 @@
</span> - "i686-apple-darwin10",
- arch == llvm::Triple::x86_64 ? "x86_64" : "");
+ IsBaseFound = false;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (HSOpts.UseMacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, "@@MACPORTS_GCC_INCLUDE_DIR@@",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Type==ToolChain::CST_MacPortsLibstdcxx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, llvm::StringRef("@@MACPORTS_GCC_INCLUDE_DIR@@"),
</span> + "",
+ "@@MACPORTS_HOST_NAME@@",
+ arch == llvm::Triple::x86_64 ? "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@" : "@@MACPORTS_GCC_SUBDIRECTORY_i386@@");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +112,7 @@
</span> IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
"4.0.0", "i686-apple-darwin8",
arch == llvm::Triple::x86_64 ? "x86_64" : "");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2010,6 +2024,12 @@ void DarwinClang::AddCXXStdlibLibArgs(co
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2010,6 +2026,12 @@ void DarwinClang::AddCXXStdlibLibArgs(co
</span> break;
case ToolChain::CST_Libstdcxx:
</pre><pre style='margin:0'>
</pre>