<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/39844191e0d1a0c637b8af2c96058ae5c9c9c896">https://github.com/macports/macports-ports/commit/39844191e0d1a0c637b8af2c96058ae5c9c9c896</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 39844191e0d1a0c637b8af2c96058ae5c9c9c896
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Apr 6 04:34:57 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang-*: fix use of -stdlib= on older machines
</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/61778
</span>---
lang/clang-11-bootstrap/Portfile | 5 +++++
lang/llvm-10/Portfile | 4 ++++
lang/llvm-11/Portfile | 4 ++++
lang/llvm-12/Portfile | 4 ++++
lang/llvm-13/Portfile | 4 ++++
lang/llvm-14/Portfile | 4 ++++
lang/llvm-15/Portfile | 4 ++++
lang/llvm-16/Portfile | 4 ++++
lang/llvm-5.0/Portfile | 4 ++++
lang/llvm-6.0/Portfile | 4 ++++
lang/llvm-7.0/Portfile | 4 ++++
lang/llvm-8.0/Portfile | 4 ++++
lang/llvm-9.0/Portfile | 4 ++++
lang/llvm-devel/Portfile | 4 ++++
14 files changed, 57 insertions(+)
<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 d4f37cd32e7..cd37a9e315f 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;'>@@ -299,6 +299,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 18} {
</span>
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
if { ${configure.build_arch} eq "arm64" } {
# see https://github.com/macports/macports-ports/commit/be1e11a368f672d927a7bdb381f2fa71a79ba483
<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 4edd4781f21..e599e5a038d 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;'>@@ -560,6 +560,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 d8e209ebb2c..0b61963725e 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;'>@@ -558,6 +558,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 247e0c6ab4b..4b85df4bb56 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;'>@@ -416,6 +416,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 b0133b40221..b9bdfea07bd 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;'>@@ -487,6 +487,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 c2a64bbeb53..ffc776eaaa4 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;'>@@ -500,6 +500,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 3fcc2bce1f4..8257f26c7e4 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;'>@@ -506,6 +506,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 20d3c2e808b..902d471d489 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;'>@@ -506,6 +506,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 d31b44fba51..907e6514899 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;'>@@ -558,6 +558,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
<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 d5df89ac5e6..68bdc50261b 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;'>@@ -629,6 +629,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
<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 beb1a2b4c3c..ec82be25ddf 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;'>@@ -659,6 +659,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
reinplace "s|@@MACPORTS_GCC_INCLUDE_DIR@@|${prefix}/include/gcc/c++|g" \
<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 e414863e4c0..11bfea0cca3 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;'>@@ -677,6 +677,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 90bd5de2952..d3522511c5f 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;'>@@ -684,6 +684,10 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 9001-macports-libstdcxx.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
<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 8afc3f4f4a6..af400cc60b0 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;'>@@ -538,6 +538,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> variant libstdcxx description {-stdlib=libstdc++_macports searches for MacPorts libstdc++} {
patchfiles-append 0005-clang-support-macports-libstdcxx.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/61778
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:libstdcxx_clang_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-patch {
if { ${configure.build_arch} eq "arm64" } {
</pre><pre style='margin:0'>
</pre>