<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d58b124eb3b8e758bdee7a40c0b612634f9754f3">https://github.com/macports/macports-base/commit/d58b124eb3b8e758bdee7a40c0b612634f9754f3</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 d58b124e don't rely on /usr/lib existing on macOS 11
</span>d58b124e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d58b124eb3b8e758bdee7a40c0b612634f9754f3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Nov 13 10:28:33 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> don't rely on /usr/lib existing on macOS 11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> We can assume /usr/lib/libxcselect.dylib is available on Big Sur.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61435
</span>---
src/port1.0/portconfigure.tcl | 2 +-
src/port1.0/portmain.tcl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ebe1e635..aad5d777 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -877,7 +877,7 @@ proc portconfigure::get_min_command_line {compiler} {
</span> if {
([option compiler.limit_flags] || [option compiler.support_environment_sdkroot]) &&
[option configure.sdkroot] ne "" &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![file exists /usr/lib/libxcselect.dylib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !([file exists /usr/lib/libxcselect.dylib] || ${os.major} >= 20)
</span> } {
return none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portmain.tcl b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 80d27943..df41f183 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portmain.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,7 +164,7 @@ set egid [getegid]
</span> default worksymlink {[file normalize [file join $portpath work]]}
default distpath {[file normalize [file join $portdbpath distfiles ${dist_subdir}]]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default use_xcode {[expr {[option build.type] eq "xcode" || ![file exists /usr/lib/libxcselect.dylib] || ![file executable /Library/Developer/CommandLineTools/usr/bin/make]}]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default use_xcode {[expr {[option build.type] eq "xcode" || !([file exists /usr/lib/libxcselect.dylib] || [option os.major] >= 20) || ![file executable /Library/Developer/CommandLineTools/usr/bin/make]}]}
</span>
proc portmain::main {args} {
return 0
</pre><pre style='margin:0'>
</pre>