<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6482df086b019d3d01a42e1f76115ea0c71aebe">https://github.com/macports/macports-ports/commit/b6482df086b019d3d01a42e1f76115ea0c71aebe</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 b6482df  clang-*: find correct GCC headers on 32-bit systems
</span>b6482df is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b6482df086b019d3d01a42e1f76115ea0c71aebe
</span>Author: mcalhoun@macports.org <mcalhoun@macports.org>
AuthorDate: Sun Jul 23 17:02:50 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    clang-*: find correct GCC headers on 32-bit systems
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/54514
</span>---
 lang/llvm-3.9/Portfile                             | 43 +++++++++++++++++++++-
 lang/llvm-3.9/files/9001-macports-libstdcxx.diff   |  4 +-
 lang/llvm-4.0/Portfile                             | 43 +++++++++++++++++++++-
 lang/llvm-4.0/files/9001-macports-libstdcxx.diff   |  4 +-
 lang/llvm-5.0/Portfile                             | 43 +++++++++++++++++++++-
 lang/llvm-5.0/files/9001-macports-libstdcxx.diff   |  4 +-
 lang/llvm-devel/Portfile                           | 43 +++++++++++++++++++++-
 lang/llvm-devel/files/9001-macports-libstdcxx.diff |  4 +-
 8 files changed, 176 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/Portfile b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e14221..8991555 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ set llvm_version        3.9
</span> set llvm_version_no_dot 39
 name                    llvm-${llvm_version}
 revision                3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport                 clang-${llvm_version} { revision 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport                 clang-${llvm_version} { revision 5 }
</span> set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
 dist_subdir             llvm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,6 +450,47 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>                 ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
             reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
                 ${worksrcpath}/tools/clang/lib/Driver/ToolChains.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # GCC was built for ${build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if GCC was also built universal, it has an extra include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 32-bit, there is an extra 64-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 64-bit, there is an extra 32-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # MacPorts GCC can not compile across platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@|${gcc_subdirectory_x86_64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_i386@@|${gcc_subdirectory_i386}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@|${gcc_subdirectory_ppc64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc@@|${gcc_subdirectory_ppc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span>         }
     }
     #default_variants +libstdcxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.9/files/9001-macports-libstdcxx.diff b/lang/llvm-3.9/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9651ec2..010e38e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.9/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.9/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@
</span>      case llvm::Triple::ppc64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span> +                                    triple);
 +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@
</span>      case llvm::Triple::x86_64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "i386", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span> +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
                                    "i686-apple-darwin10", "", "x86_64", triple);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-4.0/Portfile b/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e885f19..a1cad8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set clang_executable_version 4.0
</span> set lldb_executable_version 4.0.1
 name                    llvm-${llvm_version}
 revision                0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport                 clang-${llvm_version} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport                 clang-${llvm_version} { revision 1 }
</span> subport                 lldb-${llvm_version} {}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -567,6 +567,47 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>                 ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
             reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
                 ${worksrcpath}/tools/clang/lib/Driver/ToolChains.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # GCC was built for ${build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if GCC was also built universal, it has an extra include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 32-bit, there is an extra 64-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 64-bit, there is an extra 32-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # MacPorts GCC can not compile across platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@|${gcc_subdirectory_x86_64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_i386@@|${gcc_subdirectory_i386}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@|${gcc_subdirectory_ppc64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc@@|${gcc_subdirectory_ppc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span>         }
     }
     default_variants +libstdcxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-4.0/files/9001-macports-libstdcxx.diff b/lang/llvm-4.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 97b4c38..8900a30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-4.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-4.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@
</span>      case llvm::Triple::ppc64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span> +                                    triple);
 +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@
</span>      case llvm::Triple::x86_64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "i386", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span> +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
                                    "i686-apple-darwin10", "", "x86_64", triple);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-5.0/Portfile b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f799c9d..f73cfc6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set clang_executable_version 5.0
</span> set lldb_executable_version 5.0.0
 name                    llvm-${llvm_version}
 revision                0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport                 clang-${llvm_version} { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport                 clang-${llvm_version} { revision 2 }
</span> subport                 lldb-${llvm_version} {}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -539,6 +539,47 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>                 ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
             reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
                 ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # GCC was built for ${build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if GCC was also built universal, it has an extra include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 32-bit, there is an extra 64-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 64-bit, there is an extra 32-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # MacPorts GCC can not compile across platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@|${gcc_subdirectory_x86_64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_i386@@|${gcc_subdirectory_i386}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@|${gcc_subdirectory_ppc64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc@@|${gcc_subdirectory_ppc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span>         }
     }
     default_variants +libstdcxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-5.0/files/9001-macports-libstdcxx.diff b/lang/llvm-5.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bc76e9..7d841eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-5.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-5.0/files/9001-macports-libstdcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ index 94a7f09fd5..96dbb674de 100644
</span>      case llvm::Triple::ppc64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span> +                                    triple);
 +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@ index 94a7f09fd5..96dbb674de 100644
</span>      case llvm::Triple::x86_64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "i386", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span> +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
                                    "i686-apple-darwin10", "", "x86_64", triple);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f3648b..e418f93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ set clang_executable_version 6.0
</span> set lldb_executable_version 6.0.0
 name                    llvm-${llvm_version}
 revision                0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport                 clang-${llvm_version} { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport                 clang-${llvm_version} { revision 2 }
</span> subport                 lldb-${llvm_version} {}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -522,6 +522,47 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>             reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|g" \
                 ${worksrcpath}/tools/clang/tools/scan-build/bin/set-xcode-analyzer \
                 ${worksrcpath}/tools/clang/tools/scan-view/bin/scan-view
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # GCC was built for ${build_arch}-apple-darwin${os.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if GCC was also built universal, it has an extra include directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 32-bit, there is an extra 64-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # if ${build_arch} is 64-bit, there is an extra 32-bit subdirectory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # MacPorts GCC can not compile across platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            switch ${build_arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   "i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                i386 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    "ppc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ppc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc    ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_ppc64  "ppc64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_i386   ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set gcc_subdirectory_x86_64 "x86_64"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@|${gcc_subdirectory_x86_64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_i386@@|${gcc_subdirectory_i386}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@|${gcc_subdirectory_ppc64}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|@@MACPORTS_GCC_SUBDIRECTORY_ppc@@|${gcc_subdirectory_ppc}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
</span>         }
     }
 
<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 4bc76e9..7d841eb 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;'>@@ -100,7 +100,7 @@ index 94a7f09fd5..96dbb674de 100644
</span>      case llvm::Triple::ppc64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "", "ppc64",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc@@", "@@MACPORTS_GCC_SUBDIRECTORY_ppc64@@",
</span> +                                    triple);
 +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@ index 94a7f09fd5..96dbb674de 100644
</span>      case llvm::Triple::x86_64:
 +      if (HSOpts.UseMacPortsLibstdcxx) {
 +        AddGnuCPlusPlusIncludePaths("@@MACPORTS_GCC_INCLUDE_DIR@@",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+                                    "@@MACPORTS_HOST_NAME@@", "i386", "", triple);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                    "@@MACPORTS_HOST_NAME@@", "@@MACPORTS_GCC_SUBDIRECTORY_i386@@", "@@MACPORTS_GCC_SUBDIRECTORY_x86_64@@", triple);
</span> +      } else {
        AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2.1",
                                    "i686-apple-darwin10", "", "x86_64", triple);
</pre><pre style='margin:0'>

</pre>