<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/7a2ff3d6da47052d2fc058b1fb63929a25f6fd90">https://github.com/macports/macports-ports/commit/7a2ff3d6da47052d2fc058b1fb63929a25f6fd90</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 7a2ff3d multiple ports: create PG to handle Xcode 11 bug
</span>7a2ff3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a2ff3d6da47052d2fc058b1fb63929a25f6fd90
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 1 10:31:45 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> multiple ports: create PG to handle Xcode 11 bug
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://forums.developer.apple.com/thread/121887
</span>---
_resources/port1.0/group/cltversion-1.0.tcl | 79 ++++++++++++++++
_resources/port1.0/group/xcode_workaround-1.0.tcl | 108 ++++++++++++++++++++++
databases/redis/Portfile | 7 +-
devel/gmp/Portfile | 10 +-
lang/guile/Portfile | 7 +-
lang/luajit/Portfile | 11 +--
math/OpenBLAS/Portfile | 9 +-
math/pari/Portfile | 8 +-
multimedia/ffmpeg-devel/Portfile | 9 +-
multimedia/ffmpeg/Portfile | 7 +-
multimedia/x265/Portfile | 6 +-
net/wrk/Portfile | 10 +-
python/py-tensorflow/Portfile | 10 +-
python/py-tensorflow1/Portfile | 10 +-
14 files changed, 216 insertions(+), 75 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2346fd3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cltversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 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:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Usage:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroup cltversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cltversion is the version of CLT package installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 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:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval cltversion {
</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;background:#e0ffe0;'>+options cltversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ developerversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cltversion {[cltversion::get_default_cltversion]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default developerversion {[cltversion::get_default_developerversion]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc cltversion::get_default_cltversion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global cltversion._cltversion_version_cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists cltversion._cltversion_version_cache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [set cltversion._cltversion_version_cache]
</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;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ } 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:#e0ffe0;'>+ } 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:#e0ffe0;'>+ } 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:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result ""
</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;background:#e0ffe0;'>+ set result [string trim ${result}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There are reports of pkgutil returning (null) for version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It is unclear why this is or how common it is.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Ensure $result is a valid version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${result} 0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "cltversion: Found Command Line Tools Version ${result}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "cltversion: Unable to Find Command Line Tools using pkgutil"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This should be the end of the story.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ # 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 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:#e0ffe0;'>+ # 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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /usr/lib/libxcselect.dylib]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_file /Library/Developer/CommandLineTools/usr/lib/libxcrun.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set test_file /usr/bin/make
</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;background:#e0ffe0;'>+ if {![file exists ${test_file}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Command line tools do not seem to be installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set result none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "cltversion: The Command Line Tools are installed, but MacPorts cannot determine the version."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>+ set result ""
</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;background:#e0ffe0;'>+ set cltversion._cltversion_version_cache ${result}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${result}
</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;background:#e0ffe0;'>+proc cltversion::get_default_developerversion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global use_xcode xcodeversion cltversion
</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 ${cltversion}
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e79c95f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,108 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This PortGroup attempts to work around a bug in Xcode 11 on Catalina.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://forums.developer.apple.com/thread/121887
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Usage:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroup xcode_workaround 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xcode_workaround.type:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# append_to_compiler_flags (add -fno-stack-check to compiler flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# append_to_compiler_name (add -fno-stack-check to compiler name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid_xcode_compiler (blacklist broken compiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xcode_workaround.fixed_xcode_version: minimum developer version in which bug is fixed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cltversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval xcode_workaround {
</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;background:#e0ffe0;'>+options xcode_workaround.type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options xcode_workaround.fixed_xcode_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default xcode_workaround.type {append_to_compiler_flags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default xcode_workaround.fixed_xcode_version {11.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc xcode_workaround::xcode_workaround.appy_fix {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.major \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcodeversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cltversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ developerversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode_workaround.type \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode_workaround.fixed_xcode_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} != 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -fno-stack-check is the default prior to macOS 10.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # assume this issue will be fixed by macOS 10.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apply_fix no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # N.B. vercmp should properly handle none or "" for $xcodeversion or $cltversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcode_is_ok [expr [vercmp $xcodeversion ${xcode_workaround.fixed_xcode_version}] >= 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${use_xcode}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apply_fix [expr !${xcode_is_ok}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clt_is_ok [expr [vercmp $cltversion ${xcode_workaround.fixed_xcode_version}] >= 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${xcode_is_ok} && !${clt_is_ok}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts defaults to CLTs, but Xcode can easily be ahead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "xcode_workaround: using Xcode since the bug is fixed there"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apply_fix no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set apply_fix [expr !${clt_is_ok}]
</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;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${apply_fix}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -- ${xcode_workaround.type} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_compiler_flags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "xcode_workaround: Adding -fno-stack-check to compiler flags."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.objcxxflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_compiler_name {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "xcode_workaround: Adding -fno-stack-check to compiler name."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-delete -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ avoid_xcode_compiler {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "xcode_workaround: blacklisting Clang compiler."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-delete clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${xcode_workaround.type} is an unrecognized option for xcode_workaround.type"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "unrecognized Xcode 11 workaround type"
</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;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+port::register_callback xcode_workaround::xcode_workaround.appy_fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc xcode_workaround::xcode_workaround._proc {option action args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode_workaround.appy_fix
</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;background:#e0ffe0;'>+option_proc xcode_workaround.type xcode_workaround::xcode_workaround._proc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/redis/Portfile b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 719641a..3033383 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/redis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name redis
version 5.0.6
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,8 @@ compiler.cxx_standard 2014
</span> configure.cxx-append -std=c++14
# https://trac.macports.org/ticket/59245
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.fixed_xcode_version 11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type append_to_compiler_name
</span>
if {[string match *clang* ${configure.cxx}]} {
configure.cxx-append -stdlib=${configure.cxx_stdlib}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gmp/Portfile b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1db7b3e..4f73c91 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span>
PortSystem 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name gmp
version 6.1.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,13 +129,7 @@ if { ${auto_cpu} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# jeremyhu@macports.org - bug in Xcode11 and likely Xcode11.1 on Catalina
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {([vercmp ${os.major} 19] >= 0) && ([vercmp $xcodeversion 11.3] < 0)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx-append -fno-stack-check
</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:#e0ffe0;'>+xcode_workaround.type append_to_compiler_name
</span>
if {![variant_isset universal]} {
if {${build_arch} eq "x86_64"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/guile/Portfile b/lang/guile/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a53cb93..9569b58 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/guile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/guile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</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 compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name guile
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,8 @@ checksums rmd160 ffd6522e6ea2102dd63fcf92aab8ac076970c240 \
</span> compiler.c_standard 2011
# https://trac.macports.org/ticket/59365
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.fixed_xcode_version 11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type avoid_xcode_compiler
</span>
# previous version of guile that works well on PPC - was last at rev 1
platform darwin powerpc {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/luajit/Portfile b/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c87ee3..f117841 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/luajit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name luajit
version 2.0.5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,14 +32,8 @@ use_configure no
</span>
compiler.blacklist {clang < 700} macports-clang-3.3 macports-clang-3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Workaround for Xcode 11 issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://forums.developer.apple.com/thread/121887
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Current information is that this should be fixed in Xcode 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ([vercmp ${os.major} 19] >= 0) && ([vercmp $xcodeversion 11.2] < 0) } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -fno-stack-check
</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:#e0ffe0;'>+# changes to compiler flags must be made before `CFLAGS=...`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type append_to_compiler_flags
</span>
build.target amalg
build.args-append CC="${configure.cc}" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/OpenBLAS/Portfile b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba2854b..3e4bb68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/OpenBLAS/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup muniversal 1.0
</span> PortGroup compilers 1.0
PortGroup xcodeversion 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name OpenBLAS
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,12 +111,8 @@ use_configure no
</span> # Workaround for test failure :-
# > ./sblat2 < ./sblat2.dat
# Program received signal SIGSEGV: Segmentation fault - invalid memory reference.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Current information is that this should be fixed in Xcode 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ([vercmp ${os.major} 19] >= 0) && ([vercmp $xcodeversion 11.2] < 0) } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc-append -fno-stack-check
</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:#e0ffe0;'>+xcode_workaround.fixed_xcode_version 11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type append_to_compiler_name
</span>
pre-build {
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pari/Portfile b/math/pari/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 147a875..440a576 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/pari/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/pari/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,8 @@
</span>
PortSystem 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59295
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name pari
version 2.11.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,11 +38,6 @@ platform darwin 8 {
</span> # llvm-gcc produces incorrect code, ticket #33024
compiler.blacklist-append llvm-gcc-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59295
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.cmd ./Configure
# PARI/GP doesn't use autoconf, and if only *FLAGS environment variables are
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc2dc3f..f0099c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,9 @@ PortGroup muniversal 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59246
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
set git_commit 7c145b64417fbe674f90785d2e5a5afea1a1b821
set git_release 4.2.git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,12 +109,6 @@ platform darwin powerpc {
</span> universal_variant no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59308
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1aafdd..e81e2d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,8 @@ PortGroup xcodeversion 1.0
</span> PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59246
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name ffmpeg
conflicts ffmpeg-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,11 +107,6 @@ platform darwin powerpc {
</span> universal_variant no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x265/Portfile b/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 192d6bf..b1dfcac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x265/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
PortGroup muniversal 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name x265
version 3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,7 @@ depends_build-append \
</span> compiler.blacklist-append *llvm-gcc-4.2
# https://trac.macports.org/ticket/59246
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.fixed_xcode_version 11.2
</span>
# error: illegal text-relocation to '_x265_pw_1'
# report: https://mailman.videolan.org/pipermail/x265-devel/2014-May/004476.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wrk/Portfile b/net/wrk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6c0382..ed2072a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wrk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wrk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
github.setup wg wrk 4.1.0
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,12 +23,10 @@ checksums rmd160 66508bc4bea66d7731510164037beaac5fe44de5 \
</span> depends_build-append port:perl5
# https://trac.macports.org/ticket/59346
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Most likely related to the 'stack-check' issue.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To be reviewed once Xcode 11.2 comes out.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang > 1099}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type append_to_compiler_name
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx}" \
</span> CPP=${configure.cpp} \
VER=${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b29315f..98fe446 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup github 1.0
</span> PortGroup compilers 1.0
PortGroup xcodeversion 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name py-tensorflow
version 2.0.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,15 +95,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-enum34
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Issue with implicit -fstack-check with Xocde 11 + Darwin 19.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Current information is that this should be fixed in Xcode 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ([vercmp ${os.major} 19] >= 0) && ([vercmp $xcodeversion 11.2] < 0) } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fno-stack-check
</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;'>-
</span> use_configure yes
# Options passed to configure script via env vars
configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce84da0..c325cb9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ PortGroup github 1.0
</span> PortGroup compilers 1.0
PortGroup xcodeversion 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcode_workaround 1.0
</span>
name py-tensorflow1
version 1.15.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,15 +94,6 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-enum34
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Issue with implicit -fstack-check with Xocde 11 + Darwin 19.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Current information is that this should be fixed in Xcode 11.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ([vercmp ${os.major} 19] >= 0) && ([vercmp $xcodeversion 11.2] < 0) } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match clang ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -fno-stack-check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fno-stack-check
</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;'>-
</span> use_configure yes
# Options passed to configure script via env vars
configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
</pre><pre style='margin:0'>
</pre>