<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a5a521acd0aa1a6eac62442ae1170a18fbc68641">https://github.com/macports/macports-ports/commit/a5a521acd0aa1a6eac62442ae1170a18fbc68641</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a5a521acd0aa1a6eac62442ae1170a18fbc68641
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Aug 10 01:39:58 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> ld64: add darwin-xtools variant
</span>---
devel/ld64/Portfile | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ld64/Portfile b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 497232e756d..fe06fabb87f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ld64/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -241,6 +241,10 @@ subport ld64-xcode {
</span> version 2
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ld64-xtools {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant universal {}
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,13 +254,14 @@ if {${subport} eq ${name}} {
</span> # avoid cyclic macports-clang dep on 10.6/libc++
configure.cxx_stdlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ld64_97 conflicts ld64_127 ld64_236 ld64_274 ld64_xcode description {Use ld64-97 as the default linker (last version that works on Tiger)} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ld64_127 conflicts ld64_97 ld64_236 ld64_274 ld64_xcode description {Use ld64-127 as the default linker (last version that supports ppc and works on Leopard)} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ld64_236 conflicts ld64_97 ld64_127 ld64_274 ld64_xcode description {Use ld64-236 as the default linker (last version that builds against OS X's libstdc++)} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ld64_274 conflicts ld64_97 ld64_127 ld64_236 ld64_xcode description {Use ld64-274 as the default linker (last version that builds without libtapi support)} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ld64_xcode conflicts ld64_97 ld64_127 ld64_236 ld64_274 description {Use ld64-xcode as the default linker (version provided by the selected Xcode.app toolchain)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_97 conflicts ld64_127 ld64_236 ld64_274 ld64_xcode ld64_xtools description {Use ld64-97 as the default linker (last version that works on Tiger)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_127 conflicts ld64_97 ld64_236 ld64_274 ld64_xcode ld64_xtools description {Use ld64-127 as the default linker (last version that supports ppc and works on Leopard)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_236 conflicts ld64_97 ld64_127 ld64_274 ld64_xcode ld64_xtools description {Use ld64-236 as the default linker (last version that builds against OS X's libstdc++)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_274 conflicts ld64_97 ld64_127 ld64_236 ld64_xcode ld64_xtools description {Use ld64-274 as the default linker (last version that builds without libtapi support)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_xcode conflicts ld64_97 ld64_127 ld64_236 ld64_274 ld64_xtools description {Use ld64-xcode as the default linker (version provided by the selected Xcode.app toolchain)} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ld64_xtools conflicts ld64_97 ld64_127 ld64_236 ld64_274 ld64_xcode description {Use ld64-xtools as the default linker (version provided by installed darwin-xtools port)} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset ld64_97] && ![variant_isset ld64_127] && ![variant_isset ld64_236] && ![variant_isset ld64_274] && ![variant_isset ld64_xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset ld64_97] && ![variant_isset ld64_127] && ![variant_isset ld64_236] && ![variant_isset ld64_274] && ![variant_isset ld64_xcode] && ![variant_isset ld64_xtools]} {
</span> if {${os.major} < 9 || (${build_arch} in [list ppc ppc64])} {
default_variants +ld64_97
} elseif {${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,6 +303,8 @@ if {${subport} eq ${name}} {
</span> set ld64_ver 274
} elseif {[variant_isset ld64_xcode]} {
set ld64_ver xcode
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset ld64_xtools]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ld64_ver xtools
</span> } else {
set ld64_ver latest
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,6 +334,18 @@ if {${subport} eq ${name}} {
</span> xinstall -m 755 ${filespath}/ld-xcode ${destroot}${prefix}/libexec/ld64/ld-xcode
ln -s ../libexec/ld64/ld-xcode ${destroot}${prefix}/bin/ld-xcode
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "${name}-xtools"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:darwin-xtools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xtools_cmds {ld dyldinfo machocheck ObjectDump unwinddump}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach xtools_cmd $xtools_cmds {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../libexec/darwin-xtools/bin/${xtools_cmd} ${destroot}${prefix}/bin/${xtools_cmd}-xtools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
distfiles dyld-${dyld_version}.tar.gz ${name}-${version}.tar.gz
</pre><pre style='margin:0'>
</pre>