<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6172c05c13aaa43fb2c30e90fcfe91caf30ea838">https://github.com/macports/macports-ports/commit/6172c05c13aaa43fb2c30e90fcfe91caf30ea838</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6172c05c13aaa43fb2c30e90fcfe91caf30ea838
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 8 18:36:07 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Retire cltversion portgroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Base now provides this functionality.
</span>---
_resources/port1.0/group/cltversion-1.0.tcl | 85 -----------------------
_resources/port1.0/group/developerversion-1.0.tcl | 15 +++-
_resources/port1.0/group/xcode_workaround-1.0.tcl | 9 +--
devel/cctools/Portfile | 5 +-
lang/gcc-devel/Portfile | 5 +-
lang/gcc10-bootstrap/Portfile | 1 -
lang/gcc10/Portfile | 9 ++-
lang/gcc11/Portfile | 11 ++-
lang/gcc12/Portfile | 13 ++--
lang/gcc8/Portfile | 7 +-
lang/gcc9/Portfile | 9 ++-
11 files changed, 41 insertions(+), 128 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cltversion-1.0.tcl b/_resources/port1.0/group/cltversion-1.0.tcl
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fef649e9c25..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cltversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This PortGroup lets a port know the version of the Command Line Tool (CLT) package installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Usage:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup cltversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# cltversion is the version of CLT package installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# developerversion is the version of Apple provided developer tools to be used by MacPorts (CLTs or Xcode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-namespace eval cltversion {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-options cltversion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- developerversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default cltversion {[cltversion::get_default_cltversion]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default developerversion {[cltversion::get_default_developerversion]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cltversion::get_default_cltversion {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global cltversion._cltversion_version_cache os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists cltversion._cltversion_version_cache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [set cltversion._cltversion_version_cache]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {exec /usr/sbin/pkgutil --pkg-info=com.apple.pkg.CLTools_Executables | /usr/bin/grep version: | /usr/bin/cut -d: -f2} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![catch {exec /usr/sbin/pkgutil --pkg-info=com.apple.pkg.CLTools_Base | /usr/bin/grep version: | /usr/bin/cut -d: -f2} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![catch {exec /usr/sbin/pkgutil --pkg-info=com.apple.pkg.DeveloperToolsCLI | /usr/bin/grep version: | /usr/bin/cut -d: -f2} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![catch {exec /usr/sbin/pkgutil --pkg-info=com.apple.pkg.DeveloperToolsCLILeo | /usr/bin/grep version: | /usr/bin/cut -d: -f2} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set result ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set result [string trim ${result}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # There are reports of pkgutil returning (null) for version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # It is unclear why this is or how common it is.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure $result is a valid version number.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${result} >= 0]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "cltversion: Found Command Line Tools Version ${result}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "cltversion: Unable to Find Command Line Tools using pkgutil"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This should be the end of the story.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # However, it would seem that receipts for command line tools are easily lost when upgrading Xcode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # So it is possible that command line tools are installed (the files exist), but `pkgutil` does not recognize them.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On OS X 10.9, running `xcode-select --install` seems to reinstall the command line tools.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For later OS versions, however, if `/Library/Developer/CommandLineTools/usr/lib/libxcrun.dylib` exists, then `xcode-select --install` refuses to reinstall.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/lib/libxcselect.dylib will not exist as a file on disk on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 11 or later (Darwin 20 or later) because individual system dylibs are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only shipped in the dyld shared cache. Rest assured that if the OS is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # that new, it's always appropriate to look for a Command Line Tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # installation at the path given here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists /usr/lib/libxcselect.dylib] || ${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_file /Library/Developer/CommandLineTools/usr/lib/libxcrun.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set test_file /usr/bin/make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${test_file}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Command line tools do not seem to be installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set result none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "cltversion: The Command Line Tools are installed, but MacPorts cannot determine the version."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "cltversion: For a possible fix, please see: https://trac.macports.org/wiki/ProblemHotlist#reinstall-clt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set result ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cltversion._cltversion_version_cache ${result}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${result}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc cltversion::get_default_developerversion {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global use_xcode xcodeversion cltversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${use_xcode}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${xcodeversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ${cltversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/developerversion-1.0.tcl b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ea432eb46f..0fb29f38ac9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,10 +11,10 @@
</span> # for macOS 10.12 Sierra) and minimum_developerversion is the minimum version
# of the developer tools (either Xcode or the Command Line Tools) the port requires (e.g. 3.1).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-options minimum_developerversions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options minimum_developerversions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ developerversion
</span> default minimum_developerversions {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default developerversion {[developerversion::get_default_developerversion]}
</span>
platform macosx {
pre-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,3 +35,12 @@ platform macosx {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc developerversion::get_default_developerversion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global use_xcode xcodeversion xcodecltversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${use_xcode}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${xcodeversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${xcodecltversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcode_workaround-1.0.tcl b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e1b4291458..855c42706fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,6 @@
</span> #
# xcode_workaround.os_versions: major Darwin versions to attempt to apply workarounds
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> namespace eval xcode_workaround {
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +35,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> global \
os.major \
xcodeversion \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cltversion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- developerversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcodecltversion \
</span> xcode_workaround.type \
xcode_workaround.fixed_xcode_version \
xcode_workaround.os_versions \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +62,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> if { ${attempt_fix} } {
# Check if Xcode is newer than defined fixed version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # N.B. vercmp should properly handle none or "" for $xcodeversion or $cltversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # N.B. vercmp should properly handle none or "" for $xcodeversion or $xcodecltversion
</span> set xcode_is_ok [vercmp $xcodeversion >= ${xcode_workaround.fixed_xcode_version}]
# Check flag from cltversion PG to see if Xcode or CLT should be used
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +70,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> set attempt_fix [expr {!${xcode_is_ok}}]
} else {
# Check if CLT version is fixed or not
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set clt_is_ok [vercmp $cltversion >= ${xcode_workaround.fixed_xcode_version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clt_is_ok [vercmp $xcodecltversion >= ${xcode_workaround.fixed_xcode_version}]
</span> # If broken, but Xcode OK, use that instead
if {${xcode_is_ok} && !${clt_is_ok}} {
# MacPorts defaults to CLTs, but Xcode can easily be ahead
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53e63c170a9..a122bc9a09b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
name cctools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,8 +101,8 @@ if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
</span> # Xcode 11 has a newer cctools than the current cctools port
# Check if Xcode is 11 or newer, or if not installed if the CLT is 11 or newer
# This +xcode cutoff can be moved up as the cctools port is updated
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcode_ok [ expr { ${xcodeversion} ne "none" && [ vercmp ${xcodeversion} "11.0" ] >= 0 } ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clt_ok [ expr { ${xcodeversion} eq "none" && ${cltversion} ne "none" && [ vercmp ${cltversion} "11.0" ] >= 0 } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcode_ok [expr { ${xcodeversion} ne "none" && [vercmp ${xcodeversion} >= "11.0"] } ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clt_ok [expr { ${xcodeversion} eq "none" && ${xcodecltversion} ne "none" && [vercmp ${xcodecltversion} >= "11.0"] } ]
</span> if { ${xcode_ok} || ${clt_ok} } {
default_variants +xcode
} elseif {${os.major} >= 16} {
<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 12ee50da3a9..fa8c4811478 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;'>@@ -5,7 +5,6 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 5
name gcc-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,8 +160,8 @@ if { ${os.platform} eq "darwin" } {
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
# Extend skipping comparison to Darwin 14 and older.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ([vercmp ${xcodeversion} 12.5] >= 0 && [vercmp ${xcodeversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ([vercmp ${cltversion} 12.5] >= 0 && [vercmp ${cltversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ([vercmp ${xcodeversion} >= 12.5] && [vercmp ${xcodeversion} < 13]) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodecltversion} >= 12.5] && [vercmp ${xcodecltversion} < 13]) || \
</span> ${os.major} < 15 } \
{
# Skip bootstrap comparison entirely
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10-bootstrap/Portfile b/lang/gcc10-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 637a0a2b5f6..8b51507b1a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span> PortGroup muniversal 1.0
# ideally for this bootstrap port we want no deps on any MacPorts port. This port
<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 632d5d59a0f..2251a19b893 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;'>@@ -5,7 +5,6 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 7
name gcc10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,9 +236,9 @@ conflicts_build-append libunwind-headers binutils
</span>
# clang (as) from Xcode 12.5 has various problems with gcc build
if { ${os.platform} eq "darwin" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ( [ vercmp ${xcodeversion} 12.5 ] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodeversion} >= 12.5] || [vercmp ${xcodecltversion} >= 12.5]) } {
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${cltversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${xcodecltversion}"
</span> ui_warn "If versions > 12.5 please check if it is still required"
}
# gcc has build issues on macOS 11.3 with the use of Xcode clang as 'as'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +267,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc9
set _epoch [lindex $installed 5]
# If < 3 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 3]} {
</span> registry_deactivate_composite libgcc9 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +275,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc-devel
set _epoch [lindex $installed 5]
# If < 4 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 4]} {
</span> registry_deactivate_composite libgcc-devel "" [list ports_nodepcheck 1]
}
}
<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 262161df384..6bdc17ffdef 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;'>@@ -5,7 +5,6 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,8 +158,8 @@ if { ${os.platform} eq "darwin" } {
</span> # https://trac.macports.org/ticket/65149
# ... also now fails mysteriously on 10.7
# https://github.com/macports/macports-ports/commit/21bcf9d4ae1feade8f4c53c7608febf8d249cea8#commitcomment-78674560
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ([vercmp ${xcodeversion} 12.5] >= 0 && [vercmp ${xcodeversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ([vercmp ${cltversion} 12.5] >= 0 && [vercmp ${cltversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ([vercmp ${xcodeversion} >= 12.5] && [vercmp ${xcodeversion} < 13]) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodecltversion} >= 12.5] && [vercmp ${xcodecltversion} < 13]) || \
</span> (${os.major} <= 11) } \
{
# Skip bootstrap comparison entirely
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,7 +281,7 @@ if { ${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc8
set _epoch [lindex $installed 5]
# If < 5 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 5]} {
</span> registry_deactivate_composite libgcc8 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -290,7 +289,7 @@ if { ${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc10
set _epoch [lindex $installed 5]
# If < 6 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 6] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 6]} {
</span> registry_deactivate_composite libgcc10 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,7 +297,7 @@ if { ${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc-devel
set _epoch [lindex $installed 5]
# If < 5 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 5]} {
</span> registry_deactivate_composite libgcc-devel "" [list ports_nodepcheck 1]
}
}
<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 dec289c3ecc..69f0d40499b 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;'>@@ -5,7 +5,6 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 0
name gcc12
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,8 +126,8 @@ if { ${os.platform} eq "darwin" } {
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
# Update for gcc12 - Similar issues on macOS 10.6, 10.13 ...
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ([vercmp ${xcodeversion} 12.5] >= 0 && [vercmp ${xcodeversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ([vercmp ${cltversion} 12.5] >= 0 && [vercmp ${cltversion} 13] < 0) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ([vercmp ${xcodeversion} >= 12.5] && [vercmp ${xcodeversion} < 13]) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodecltversion} >= 12.5] && [vercmp ${xcodecltversion} < 13]) || \
</span> ${os.major} < 11 || ${os.major} == 17 } \
{
# Skip bootstrap comparison entirely
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,7 +254,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc8
set _epoch [lindex $installed 5]
# If < 5 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 5]} {
</span> registry_deactivate_composite libgcc8 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,7 +262,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc10
set _epoch [lindex $installed 5]
# If < 6 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 6] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 6]} {
</span> registry_deactivate_composite libgcc10 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,7 +270,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc11
set _epoch [lindex $installed 5]
# If < 1 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 1] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 1]} {
</span> registry_deactivate_composite libgcc11 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,7 +278,7 @@ if {${subport} ne ${name}} {
</span> # Extract the epoch of the installed libgcc-devel
set _epoch [lindex $installed 5]
# If < 5 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 5]} {
</span> registry_deactivate_composite libgcc-devel "" [list ports_nodepcheck 1]
}
}
<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 a2a674fbfa2..97344a793f8 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;'>@@ -6,7 +6,6 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup xcodeversion 1.0
PortGroup conflicts_build 1.0
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 5
name gcc8
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,9 +157,9 @@ platform darwin 10 {
</span> }
if { ${os.platform} eq "darwin" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${xcodeversion} 12.5] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [vercmp ${xcodeversion} >= 12.5] || [vercmp ${xcodecltversion} >= 12.5]} {
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${cltversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${xcodecltversion}"
</span> ui_warn "If versions > 12.5 please check if it is still required"
}
# gcc has build issues on macOS 11.3 with the use of Xcode clang via cctools for ld
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,7 +233,7 @@ if { ${os.major} < 10 || ${os.arch} eq "arm" || ${os.major} > 14 } {
</span> # https://trac.macports.org/ticket/59351
# for more background on the issue.
if { ${os.major} >= 19 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 11.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} < 11.3]} {
</span> known_fail yes
pre-fetch {
ui_error "${name} ${version} is (currently) not supported on Darwin ${os.major} Xcode ${xcodeversion}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83312826da6..a34df2d457c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,6 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup active_variants 1.1
PortGroup conflicts_build 1.0
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cltversion 1.0
</span>
epoch 3
name gcc9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,9 +144,9 @@ configure.env-append \
</span>
# clang (as) from Xcode 12.5 has various problems with gcc build
if { ${os.platform} eq "darwin" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ( [ vercmp ${xcodeversion} 12.5 ] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodeversion} >= 12.5] || [vercmp ${xcodecltversion} >= 12.5]) } {
</span> pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${cltversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${xcodecltversion}"
</span> ui_warn "If versions > 12.5 please check if it is still required"
}
# gcc has build issues on macOS 11.3 with the use of Xcode clang as 'as'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -225,7 +224,7 @@ if {${subport} eq "libgcc9"} {
</span> # Extract the epoch of the installed libgcc8
set _epoch [lindex $installed 5]
# If < 4 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 4]} {
</span> registry_deactivate_composite libgcc8 "" [list ports_nodepcheck 1]
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +232,7 @@ if {${subport} eq "libgcc9"} {
</span> # Extract the epoch of the installed libgcc-devel
set _epoch [lindex $installed 5]
# If < 3 need to deactivate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp $_epoch 3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch < 3]} {
</span> registry_deactivate_composite libgcc-devel "" [list ports_nodepcheck 1]
}
}
</pre><pre style='margin:0'>
</pre>