<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/2158b2815d0387f3e2137c72ea301dc1ab70dfbd">https://github.com/macports/macports-ports/commit/2158b2815d0387f3e2137c72ea301dc1ab70dfbd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2158b2815d0387f3e2137c72ea301dc1ab70dfbd
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon Dec 16 20:36:09 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> gcc{5,6,7,8}: Allow builds on Darwin19+ with Xcode 11.3+
</span>---
lang/gcc5/Portfile | 28 +++++++++++++++-------------
lang/gcc6/Portfile | 28 +++++++++++++++-------------
lang/gcc7/Portfile | 21 ++++++++++++---------
lang/gcc8/Portfile | 21 ++++++++++++---------
4 files changed, 54 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc5/Portfile b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82e5976..9243b62 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name gcc5
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -195,18 +195,20 @@ use_parallel_build yes
</span>
destroot.target install install-info-host
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently only gcc9 builds on Darwin19+. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On Darwin19+ fails to build for Xcode < 11.3
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59351
</span> # for more background on the issue.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hopefully addressed in a future Xcode release (>11.1) but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for now just error out.
</span> if { ${os.major} >= 19 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 for more details"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Until the issue is addressed in Xcode, please instead install gcc9 / libgcc9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 11.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major} Xcode ${xcodeversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 and"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error " https://trac.macports.org/ticket/59351 for more details"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "To install this port upgrade Xcode to 11.3 or newer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/Portfile b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cbf403..b8b6188 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup conflicts_build 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name gcc6
epoch 3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,18 +164,20 @@ use_parallel_build yes
</span>
destroot.target install install-info-host
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently only gcc9 builds on Darwin19+. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On Darwin19+ fails to build for Xcode < 11.3
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59351
</span> # for more background on the issue.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hopefully addressed in a future Xcode release (>11.1) but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for now just error out.
</span> if { ${os.major} >= 19 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 for more details"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Until the issue is addressed in Xcode, please instead install gcc9 / libgcc9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 11.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major} Xcode ${xcodeversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 and"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error " https://trac.macports.org/ticket/59351 for more details"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "To install this port upgrade Xcode to 11.3 or newer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27bf288..d1b6530 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup select 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span> PortGroup conflicts_build 1.0
name gcc7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,18 +163,20 @@ use_parallel_build yes
</span>
destroot.target install install-info-host
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently only gcc9 builds on Darwin19+. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On Darwin19+ fails to build for Xcode < 11.3
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59351
</span> # for more background on the issue.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hopefully addressed in a future Xcode release (>11.1) but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for now just error out.
</span> if { ${os.major} >= 19 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 for more details"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Until the issue is addressed in Xcode, please instead install gcc9 / libgcc9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 11.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major} Xcode ${xcodeversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 and"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error " https://trac.macports.org/ticket/59351 for more details"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "To install this port upgrade Xcode to 11.3 or newer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af06c65..50c943c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,18 +166,21 @@ if { ${os.major} < 10 } {
</span> return -code error "incompatible OS X version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently only gcc9 builds on Darwin19+. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On Darwin19+ fails to build for Xcode < 11.3
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59351
</span> # for more background on the issue.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Hopefully addressed in a future Xcode release (>11.1) but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for now just error out.
</span> if { ${os.major} >= 19 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 for more details"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Until the issue is addressed in Xcode, please instead install gcc9 / libgcc9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS X version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 11.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major} Xcode ${xcodeversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90835 and"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error " https://trac.macports.org/ticket/59351 for more details"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "To install this port upgrade Xcode to 11.3 or newer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible Xcode version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>