<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0168bf9b5320971642238372cc2fd1267ab2eefc">https://github.com/macports/macports-ports/commit/0168bf9b5320971642238372cc2fd1267ab2eefc</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 0168bf9 muniversal PG: do not explicitly set NM
</span>0168bf9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0168bf9b5320971642238372cc2fd1267ab2eefc
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 23 11:38:04 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: do not explicitly set NM
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This code was originally meant as a workaround for a libtool error
</span><span style='display:block; white-space:pre;color:#404040;'> when cross-compiling.
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-ports/commit/92dd44074ab7bd2ff2fcf5805b26931b78110907
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Based on experiments with a 10.5 VM, each port for which this was a
</span><span style='display:block; white-space:pre;color:#404040;'> problem started using a newer version of libtool sometime in the last
</span><span style='display:block; white-space:pre;color:#404040;'> few years, and the workaround is no longer necessary.
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 20 --------------------
1 file changed, 20 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 cfac420..31c1b1a 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,27 +196,7 @@ variant universal {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Must be executed in a more general scope than the configure phase,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # otherwise the dependencies won't have an effect during said phase.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # WARNING: Keep this in sync with the nm stuff in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # configure phase override below!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/nm]} {
</span><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><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix inability to find nm when cross-compiling (#22224, #23431, #23687, #24477, et al)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: I suspect we should remove this. base doesn't do this, so I don't see why muniversal should.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This also seems like a bug in certain versions of autoconf, so ports should just autoreconf (or patch).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${prefix}/bin/nm]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append NM=${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append NM=/usr/bin/nm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
foreach arch ${universal_archs_to_use} {
ui_info "$UI_PREFIX [format [msgcat::mc "Configuring %1\$s for architecture %2\$s"] ${subport} ${arch}]"
</pre><pre style='margin:0'>
</pre>