<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/610e8f5ed549bf347ed5abe5707d241e97656e4c">https://github.com/macports/macports-ports/commit/610e8f5ed549bf347ed5abe5707d241e97656e4c</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 610e8f5ed54 clang-*: fix use of -stdlib= on newer machines
</span>610e8f5ed54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 610e8f5ed549bf347ed5abe5707d241e97656e4c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Apr 5 07:17:45 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang-*: fix use of -stdlib= on newer machines
</span>---
lang/clang-11-bootstrap/Portfile | 11 ++---------
lang/llvm-10/Portfile | 11 ++---------
lang/llvm-11/Portfile | 11 ++---------
lang/llvm-12/Portfile | 11 ++---------
lang/llvm-13/Portfile | 11 ++---------
lang/llvm-14/Portfile | 11 ++---------
lang/llvm-15/Portfile | 11 ++---------
lang/llvm-16/Portfile | 11 ++---------
lang/llvm-5.0/Portfile | 4 ++--
lang/llvm-6.0/Portfile | 2 +-
lang/llvm-7.0/Portfile | 2 +-
lang/llvm-8.0/Portfile | 11 ++---------
lang/llvm-9.0/Portfile | 11 ++---------
lang/llvm-devel/Portfile | 11 ++---------
14 files changed, 26 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/clang-11-bootstrap/Portfile b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd37a9e315f..25fda5edffa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/clang-11-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.0
</span> name clang-11-bootstrap
version 11.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> epoch 0
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,17 +305,10 @@ if {${os.major} < 11} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp \
${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.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;color:#808080;'>diff --git a/lang/llvm-10/Portfile b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e599e5a038d..9b10afe794c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ set clang_executable_version 10
</span> set lldb_executable_version 10
name llvm-${llvm_version}
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 8 }
</span> subport lldb-${llvm_version} { revision 3 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -566,17 +566,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp \
${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.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;color:#808080;'>diff --git a/lang/llvm-11/Portfile b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b61963725e..b8fbe476ac7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ checksums rmd160 f566b4b75c8f30418f19069a9a84864ead766401 \
</span>
name llvm-${llvm_version}
revision 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 6 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 7 }
</span> subport flang-${llvm_version} { revision 1 }
subport lldb-${llvm_version} { revision 2 }
set suffix mp-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,17 +564,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp \
${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.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;color:#808080;'>diff --git a/lang/llvm-12/Portfile b/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b85df4bb56..fa22eb5a135 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ use_xz yes
</span>
name llvm-${llvm_version}
revision 3
<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} {revision 2}
dist_subdir llvm
set suffix mp-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,17 +422,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Frontend/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-13/Portfile b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b9bdfea07bd..7a034691633 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ version ${llvm_version}.0.1
</span> name llvm-${llvm_version}
revision 2
subport mlir-${llvm_version} { revision 0 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 3 }
</span> subport lldb-${llvm_version} { revision 1 }
subport flang-${llvm_version} { revision 0 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -493,17 +493,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Frontend/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-14/Portfile b/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ffc776eaaa4..f51aedd2fe3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ version ${llvm_version}.0.6
</span> name llvm-${llvm_version}
revision 0
subport mlir-${llvm_version} { revision 0 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 1 }
</span> subport lldb-${llvm_version} { revision 0 }
subport flang-${llvm_version} { revision 0 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -506,17 +506,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Lex/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-15/Portfile b/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8257f26c7e4..f57048fb2f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-15/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ version ${llvm_version}.0.7
</span> name llvm-${llvm_version}
revision 0
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision [ expr ${revision} + 1 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision [ expr ${revision} + 2 ] }
</span> subport lldb-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,17 +512,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Lex/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/Portfile b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 902d471d489..716ab6ab55a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ version ${llvm_version}.0.1
</span> name llvm-${llvm_version}
revision 0
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision [ expr ${revision} + 1 ] }
</span> subport lldb-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -512,17 +512,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Lex/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<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 907e6514899..f0ad2798534 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;'>@@ -11,7 +11,7 @@ set clang_executable_version 5.0
</span> set lldb_executable_version 5.0.2
name llvm-${llvm_version}
revision 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 5 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 6 }
</span> subport lldb-${llvm_version} { revision 2 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +370,7 @@ platform darwin {
</span>
# https://llvm.org/bugs/show_bug.cgi?id=25680
configure.cxxflags-append -U__STRICT_ANSI__
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Wrong type in OrcRemoteTargetClient.h
# error: could not convert 'Src->((llvm::orc::remote::OrcRemoteTargetClient<ChannelT>*)this)->callB<llvm::orc::remote::OrcRemoteTargetRPCAPI::ReadMem>(Size)'
# from 'Expected<vector<unsigned char,allocator<unsigned char>>>' to 'Expected<vector<char,allocator<char>>>'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-6.0/Portfile b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68bdc50261b..18a76523bc0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ set clang_executable_version 6.0
</span> set lldb_executable_version 6.0.1
name llvm-${llvm_version}
revision 4
<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> subport lldb-${llvm_version} { revision 2 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-7.0/Portfile b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec82be25ddf..7b41371dbc6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ set clang_executable_version 7
</span> set lldb_executable_version 7.1.0
name llvm-${llvm_version}
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 3 }
</span> subport lldb-${llvm_version} { revision 1 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-8.0/Portfile b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11bfea0cca3..9b392ceecdc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ set llvm_patch_revision 1
</span> set lldb_executable_version 8.0.${llvm_patch_revision}
name llvm-${llvm_version}
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 4 }
</span> subport lldb-${llvm_version} { revision 2 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -683,16 +683,9 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</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;color:#808080;'>diff --git a/lang/llvm-9.0/Portfile b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d3522511c5f..cd63e04e949 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-9.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ set clang_executable_version 9
</span> set lldb_executable_version 9.0.0
name llvm-${llvm_version}
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision 6 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision 7 }
</span> subport lldb-${llvm_version} { revision 3 }
set suffix mp-${llvm_version}
set sub_prefix ${prefix}/libexec/llvm-${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -690,17 +690,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${worksrcpath}/tools/clang/lib/Frontend/InitHeaderSearch.cpp \
${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${worksrcpath}/tools/clang/lib/Driver/ToolChains/Darwin.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;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 af400cc60b0..c2706d384a4 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;'>@@ -47,7 +47,7 @@ checksums rmd160 0fd2ccc6f5fbbacf52e5f6b8e6ce03e67a7c244d \
</span>
name llvm-${llvm_version}
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision [ expr ${revision} + 1 ] }
</span> subport lldb-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -544,17 +544,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.build_arch} eq "arm64" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch aarch64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_arch ${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
${patch.dir}/clang/lib/Lex/InitHeaderSearch.cpp \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MACPORTS_HOST_NAME@@|${gcc_arch}-apple-darwin${os.major}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MACPORTS_HOST_NAME@@|${configure.build_arch}-apple-darwin${os.major}|g" \
</span> ${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
reinplace "s|@@MACPORTS_libstdc++@@|${prefix}/lib/libgcc/libstdc++.6.dylib|g" \
${patch.dir}/clang/lib/Driver/ToolChains/Darwin.cpp
</pre><pre style='margin:0'>
</pre>