<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/13147ef6de549b807b22edc489725c5380b24195">https://github.com/macports/macports-ports/commit/13147ef6de549b807b22edc489725c5380b24195</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 13147ef6de549b807b22edc489725c5380b24195
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Fri Jan 20 07:41:48 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> _resources/port1.0/group/muniversal-1.0.tcl: fix some builds in trace mode for ports not overwriting depends_build.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In trace mode, port itself can happily check for and execute random
</span><span style='display:block; white-space:pre;color:#404040;'> files, but the actual build process spawned later will be unable to work
</span><span style='display:block; white-space:pre;color:#404040;'> with ${prefix}/bin/nm if it's not a proper dependency.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Given that we only set NM to ${prefix}/bin/nm if it already exists on
</span><span style='display:block; white-space:pre;color:#404040;'> the file system, it must be installed at that time and the build
</span><span style='display:block; white-space:pre;color:#404040;'> dependency doesn't add additional cruft.
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 5 +++++
1 file changed, 5 insertions(+)
<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 5c37802..1fc18cf 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;'>@@ -201,6 +201,11 @@ variant universal {
</span> # 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 but 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:#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> configure.env-append NM=${prefix}/bin/nm
} else {
configure.env-append NM=/usr/bin/nm
</pre><pre style='margin:0'>
</pre>