<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/970cfab62b3c3cd52631d19e49cedd77e0e57667">https://github.com/macports/macports-ports/commit/970cfab62b3c3cd52631d19e49cedd77e0e57667</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 970cfab _resources/port1.0/group/muniversal-1.0.tcl: move cctools dependency up to the general universal variant scope.
</span>970cfab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 970cfab62b3c3cd52631d19e49cedd77e0e57667
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Fri Jan 20 10:16:10 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> _resources/port1.0/group/muniversal-1.0.tcl: move cctools dependency up to the general universal variant scope.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adding it in the configure phase override will be too late for this
</span><span style='display:block; white-space:pre;color:#404040;'> phase.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Trace mode will not respect this dependency in this case.
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e4eea5..cfac420 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,16 +196,23 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Must be executed in a more general scope than the configure phase,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # otherwise the dependencies won't have an effect during said phase.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # WARNING: Keep this in sync with the nm stuff in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure phase override below!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/nm]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix some builds in trace mode for ports that do not simply overwrite depends_build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # port itself may happily check and execute files, but trace mode will prevent ${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from being used if it's not a proper build dependency. Given it's already installed, this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build dependency doesn't add additional cruft.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure {
# Fix inability to find nm when cross-compiling (#22224, #23431, #23687, #24477, et al)
# TODO: I suspect we should remove this. base doesn't do this, so I don't see why muniversal should.
# This also seems like a bug in certain versions of autoconf, so ports should just autoreconf (or patch).
if {[file exists ${prefix}/bin/nm]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix some builds in trace mode for ports that do not simply overwrite depends_build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port itself may happily check and execute files, but trace mode will prevent ${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from being used if it's not a proper build dependency. Given it's already installed, this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # build dependency doesn't add additional cruft.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:cctools
</span> configure.env-append NM=${prefix}/bin/nm
} else {
configure.env-append NM=/usr/bin/nm
</pre><pre style='margin:0'>
</pre>