<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/117da72612aa719afff3fc8b77169ebc6f460ad7">https://github.com/macports/macports-ports/commit/117da72612aa719afff3fc8b77169ebc6f460ad7</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 117da72612a rust: revert to last setup building for macOS<10.13
</span>117da72612a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 117da72612aa719afff3fc8b77169ebc6f460ad7
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun May 9 16:46:16 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> rust: revert to last setup building for macOS<10.13
</span>---
_resources/port1.0/group/cargo_fetch-1.0.tcl | 2 +-
lang/rust/Portfile | 24 +++++++++++++++---------
2 files changed, 16 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo_fetch-1.0.tcl b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 219a7a6189b..f25892ecc91 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -286,7 +286,7 @@ proc cargo.environments {} {
</span> configure.cxx ${prefix}/libexec/rust-compiler-wrap/bin/clang++
configure.objc ${prefix}/libexec/rust-compiler-wrap/bin/clang
configure.objcxx ${prefix}/libexec/rust-compiler-wrap/bin/clang++
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cargo_ld ${prefix}/libexec/rust-compiler-wrap/bin/clang-ld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cargo_ld ${prefix}/libexec/rust-compiler-wrap/bin/ld-rust
</span> }
cargo.append_envs CC=${configure.cc} {build destroot}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/Portfile b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1297fff7e85..0205bd69450 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span>
name rust
version 1.52.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories lang devel
platforms darwin
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,8 +213,6 @@ subport ${ccwrap} {
</span> depends_build
# Always build from source to ensure we use user's compiler selection
archive_sites
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Always depend on legacy support as flags need to be baked into wrapper scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as rust doesn't allow information to be passed by arbitrary environment vars.
</span> depends_lib-append [legacysupport::get_dependency]
use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,10 +226,12 @@ subport ${ccwrap} {
</span> # If this fails just use exact settings for cc and cxx
set sel_cc ${configure.cc}
set sel_cxx ${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sel_ld ld
</span> if {[regexp {macports-clang-(.*)} ${configure.compiler} -> llvm_ver]} {
set llvm_path ${prefix}/libexec/llvm-${llvm_ver}
set sel_cc ${llvm_path}/bin/clang
set sel_cxx ${llvm_path}/bin/clang++
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sel_ld ${llvm_path}/bin/ld
</span> }
xinstall -m 755 -d ${destroot}${wrapdir}
proc create_wrapper { fname comp flags } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,11 +254,17 @@ subport ${ccwrap} {
</span> close ${f}
}
create_wrapper ${destroot}${wrapdir}/clang \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sel_cc}" "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_RUST_CC\:\-${sel_cc}\}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\}"
</span> create_wrapper ${destroot}${wrapdir}/clang++ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sel_cxx}" "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- create_wrapper ${destroot}${wrapdir}/clang-ld \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${sel_cc}" "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\} \$\{MACPORTS_LEGACY_SUPPORT_LDFLAGS\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_RUST_CXX\:\-${sel_cxx}\}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create_wrapper ${destroot}${wrapdir}/ld-rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_RUST_CC\:\-${sel_cc}\}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_LEGACY_SUPPORT_CPPFLAGS\} \$\{MACPORTS_LEGACY_SUPPORT_LDFLAGS\}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create_wrapper ${destroot}${wrapdir}/ld \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_RUST_LD\:\-${sel_ld}\}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "\$\{MACPORTS_LEGACY_SUPPORT_LDFLAGS\}"
</span> foreach cmd { ar as nm nm-classic libtool lipo objdump otool ranlib \
size size-classic strip strings bitcode-strip segedit } {
ln -s ${prefix}/bin/${cmd} ${destroot}${wrapdir}/${cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,7 +280,7 @@ if { ${subport} ne ${ccwrap} } {
</span> configure.cxx ${wrapdir}/clang++
configure.objc ${wrapdir}/clang
configure.objcxx ${wrapdir}/clang++
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ld ${wrapdir}/clang-ld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ld ${wrapdir}/ld-rust
</span> set NewPath "${wrapdir}:${NewPath}"
}
envs_append "PATH=${NewPath}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -300,7 +306,7 @@ configure.args --enable-vendor \
</span>
# Cache support
if { ${subport} ne ${ccwrap} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [tbool configure.ccache] } {
</span> depends_build-append port:ccache
configure.args-append --enable-ccache
}
</pre><pre style='margin:0'>
</pre>