<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139338] trunk/dports/devel/ld64</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139338">139338</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-08-13 08:27:39 -0700 (Thu, 13 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ld64: Add an +ld64_xcode variant to default to the Xcode-provided version of ld</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelld64Portfile">trunk/dports/devel/ld64/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelld64filesldxcode">trunk/dports/devel/ld64/files/ld-xcode</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelld64Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/ld64/Portfile (139337 => 139338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/Portfile 2015-08-13 14:54:59 UTC (rev 139337)
+++ trunk/dports/devel/ld64/Portfile 2015-08-13 15:27:39 UTC (rev 139338)
</span><span class="lines">@@ -178,6 +178,10 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+subport ld64-xcode {
+ version 1
+}
+
</ins><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="lines">@@ -185,10 +189,11 @@
</span><span class="cx"> build {}
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>- variant ld64_97 conflicts ld64_127 ld64_136 ld64_236 description {Use ld64-97 as the default linker (last version that works on Tiger)} {}
- variant ld64_127 conflicts ld64_97 ld64_136 ld64_236 description {Use ld64-127 as the default linker (last version to support ppc)} {}
- variant ld64_136 conflicts ld64_97 ld64_127 ld64_236 description {Use ld64-136 as the default linker (last version that works on Leopard)} {}
- variant ld64_236 conflicts ld64_97 ld64_127 ld64_136 description {Use ld64-236 as the default linker (last version that builds against OS X's libstdc++)} {}
</del><ins>+ variant ld64_97 conflicts ld64_127 ld64_136 ld64_236 ld64_xcode description {Use ld64-97 as the default linker (last version that works on Tiger)} {}
+ variant ld64_127 conflicts ld64_97 ld64_136 ld64_236 ld64_xcode description {Use ld64-127 as the default linker (last version to support ppc)} {}
+ variant ld64_136 conflicts ld64_97 ld64_127 ld64_236 ld64_xcode description {Use ld64-136 as the default linker (last version that works on Leopard)} {}
+ variant ld64_236 conflicts ld64_97 ld64_127 ld64_136 ld64_xcode description {Use ld64-236 as the default linker (last version that builds against OS X's libstdc++)} {}
+ variant ld64_xcode conflicts ld64_97 ld64_127 ld64_136 ld64_236 description {Use ld64-xcode as the default linker (version provided by the selected Xcode.app toolchain)} {}
</ins><span class="cx">
</span><span class="cx"> if {![variant_isset ld64_97] && ![variant_isset ld64_127] && ![variant_isset ld64_136]} {
</span><span class="cx"> if {${os.major} < 9} {
</span><span class="lines">@@ -208,6 +213,8 @@
</span><span class="cx"> set ld64_ver 136
</span><span class="cx"> } elseif {[variant_isset ld64_236]} {
</span><span class="cx"> set ld64_ver 236
</span><ins>+ } elseif {[variant_isset ld64_xcode]} {
+ set ld64_ver xcode
</ins><span class="cx"> } else {
</span><span class="cx"> set ld64_ver latest
</span><span class="cx"> }
</span><span class="lines">@@ -215,16 +222,26 @@
</span><span class="cx"> depends_run port:ld64-${ld64_ver}
</span><span class="cx">
</span><span class="cx"> destroot {
</span><del>- ln -s dyldinfo-${ld64_ver} ${destroot}${prefix}/bin/dyldinfo
</del><span class="cx"> ln -s ld-${ld64_ver} ${destroot}${prefix}/bin/ld
</span><del>- ln -s machocheck-${ld64_ver} ${destroot}${prefix}/bin/machocheck
- ln -s ObjectDump-${ld64_ver} ${destroot}${prefix}/bin/ObjectDump
- ln -s rebase-${ld64_ver} ${destroot}${prefix}/bin/rebase
- ln -s unwinddump-${ld64_ver} ${destroot}${prefix}/bin/unwinddump
</del><span class="cx">
</span><span class="cx"> file mkdir ${destroot}${prefix}/libexec/ld64
</span><span class="cx"> ln -s ld-${ld64_ver} ${destroot}${prefix}/libexec/ld64/ld
</span><ins>+
+ if {![variant_isset ld64_xcode]} {
+ ln -s dyldinfo-${ld64_ver} ${destroot}${prefix}/bin/dyldinfo
+ ln -s machocheck-${ld64_ver} ${destroot}${prefix}/bin/machocheck
+ ln -s ObjectDump-${ld64_ver} ${destroot}${prefix}/bin/ObjectDump
+ ln -s rebase-${ld64_ver} ${destroot}${prefix}/bin/rebase
+ ln -s unwinddump-${ld64_ver} ${destroot}${prefix}/bin/unwinddump
+ }
</ins><span class="cx"> }
</span><ins>+} elseif {${subport} eq "${name}-xcode"} {
+ distfiles
+ use_configure no
+ build {}
+ destroot {
+ xinstall -m 755 ${filespath}/ld-xcode ${destroot}${prefix}/bin/ld-xcode
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> depends_build path:include/mach-o/dyld_priv.h:dyld-headers \
</span><span class="cx"> path:include/mach-o/arm/reloc.h:libmacho-headers
</span></span></pre></div>
<a id="trunkdportsdevelld64filesldxcode"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/ld64/files/ld-xcode (0 => 139338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/ld64/files/ld-xcode (rev 0)
+++ trunk/dports/devel/ld64/files/ld-xcode 2015-08-13 15:27:39 UTC (rev 139338)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+#!/bin/bash
+
+if [[ -x /usr/bin/xcrun ]] ; then
+ exec /usr/bin/xcrun ld "${@}"
+elif [[ -x /usr/bin/ld ]] ; then
+ exec /usr/bin/ld "${@}"
+else
+ exec ld "${@}"
+fi
</ins><span class="cx">Property changes on: trunk/dports/devel/ld64/files/ld-xcode
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>