<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/7e8ac0ad0bdc1e00efef634e37968f32ab4b9480">https://github.com/macports/macports-ports/commit/7e8ac0ad0bdc1e00efef634e37968f32ab4b9480</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 7e8ac0ad0bd gccN-libcxx: Disable post-patch phase
</span>7e8ac0ad0bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e8ac0ad0bdc1e00efef634e37968f32ab4b9480
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 17 10:19:32 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> gccN-libcxx: Disable post-patch phase
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66282
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66277
</span>---
lang/gcc-devel/Portfile | 5 +++--
lang/gcc10/Portfile | 5 +++--
lang/gcc11/Portfile | 5 +++--
lang/gcc12/Portfile | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/Portfile b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38a919621fa..d02e2da1030 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,8 @@ long_description {*}${description}, including front ends for \
</span>
set libgccname lib${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.arch} eq "arm"} {
# Use lead Darwin developer branch for now
# Eventually Darwin Arm support will be merged with upstream at which point
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +159,7 @@ configure.args-append --disable-tls
</span> # Disable ccache
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} && ${os.platform} eq "darwin" } {
</span> # gcc has build issues on macOS 11.3 with the use of Xcode 12.5 clang via cctools for ld
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,7 +211,6 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libcxxname ${name}-libcxx
</span> subport ${libcxxname} {
PortGroup compilers 1.0
compilers.choose cxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff97c688644..7637a8014df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,8 @@ checksums rmd160 5095b725b8846a4946495f5415aab02c3352d763 \
</span> set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.platform} eq "darwin" } {
# Patch generated from https://github.com/iains/gcc-10-branch
# git diff --no-prefix releases/gcc-10.4.0 gcc-10-4-darwin-pre-r0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +143,7 @@ configure.args --enable-languages=[join ${gcc_configure_langs} ","] \
</span> configure.args-append \
--disable-tls
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} && ${os.platform} eq "darwin" } {
</span> # Bootstrap comparison fails on 10.6, so disable
# https://trac.macports.org/ticket/65280
if { (${os.major} <= 10) } \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +192,6 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libcxxname ${name}-libcxx
</span> subport ${libcxxname} {
PortGroup compilers 1.0
compilers.choose cxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/Portfile b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 55fc74f036c..29efc7e5c56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,8 @@ checksums rmd160 0c54f3971b4afbd78954d46852f733ff3fae266c \
</span> set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.platform} eq "darwin" } {
# Patch generated from https://github.com/iains/gcc-11-branch
# git diff --no-prefix releases/gcc-11.3.0 gcc-11.3-darwin-r2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +153,7 @@ configure.args-append \
</span> # Disable ccache
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} && ${os.platform} eq "darwin" } {
</span> # gcc has build issues on macOS 11.3 with the use of Xcode 12.5 clang via cctools for ld
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,7 +214,6 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libcxxname ${name}-libcxx
</span> subport ${libcxxname} {
PortGroup compilers 1.0
compilers.choose cxx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc12/Portfile b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13e07b05ca0..e7ff52f52b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +26,8 @@ revision 2
</span> set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set libcxxname ${name}-libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 76d30c411227d6c3e87dd4f0a8ea1ae5d8ab9ffd \
sha256 e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff \
size 84645292
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +125,7 @@ configure.args-append --disable-tls
</span> # Disable ccache
configure.ccache no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${libcxxname} && ${os.platform} eq "darwin" } {
</span> # gcc has build issues on macOS 11.3 with the use of Xcode 12.5 clang via cctools for ld
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,7 +183,6 @@ pre-configure {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set libcxxname ${name}-libcxx
</span> subport ${libcxxname} {
PortGroup compilers 1.0
compilers.choose cxx
</pre><pre style='margin:0'>
</pre>