<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/b82f938ab16e0ca63baa90f3adbb0732fc9dbd20">https://github.com/macports/macports-ports/commit/b82f938ab16e0ca63baa90f3adbb0732fc9dbd20</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 b82f938ab16 compilers PG: Disable use of -stdlib on PPC
</span>b82f938ab16 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b82f938ab16e0ca63baa90f3adbb0732fc9dbd20
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Nov 14 11:50:51 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Disable use of -stdlib on PPC
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 84178794657..e9a60a3b56d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,8 +146,12 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,f90) ${prefix}/bin/gfortran-mp-$ver
# The devel port, and starting with version 10, GCC will support using -stdlib=libc++,
# so use it for improved compatibility with clang builds
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $ver eq "devel" || [vercmp ${ver} >= 10]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,cxx_stdlib) libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_arch} ni [list ppc ppc64] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $ver eq "devel" || [vercmp ${ver} >= 10]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,cxx_stdlib) libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,cxx_stdlib) libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
set cdb(gcc$ver_nodot,cxx_stdlib) libstdc++
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,6 +273,7 @@ proc compilers.setup_variants {variants} {
</span> global compilers.my_fortran_variants compilers.list
global compilers.variants_conflict
global compilers.clear_archflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global build_arch
</span>
set compilers.my_fortran_variants {}
foreach variant $variants {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,17 +344,19 @@ proc compilers.setup_variants {variants} {
</span> configure.cxx_stdlib ${mystdlib}
"
set set_stdlib no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If variant is gcc10+ pass -stdlib option to correctly handle libc++ versus libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match gcc* $variant]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [regexp {gcc(.*)} ${variant} -> gcc_v] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set set_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_arch} ni [list ppc ppc64] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If variant is gcc10+ pass -stdlib option to correctly handle libc++ versus libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match gcc* $variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {gcc(.*)} ${variant} -> gcc_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Always set with clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang* $variant]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set set_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Always set with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match clang* $variant]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set set_stdlib yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if { ${set_stdlib} eq "yes" } {
append body "
</pre><pre style='margin:0'>
</pre>