<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97a9b7e1c919725137b080cfa3951bb6a5476fe9">https://github.com/macports/macports-ports/commit/97a9b7e1c919725137b080cfa3951bb6a5476fe9</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 97a9b7e1c91 rust: find correct static runtime library
</span>97a9b7e1c91 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97a9b7e1c919725137b080cfa3951bb6a5476fe9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 12 10:06:02 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust: find correct static runtime library
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/64146
</span>---
_resources/port1.0/group/rust-1.0.tcl | 14 ++++++++++++++
lang/rust/Portfile | 7 -------
2 files changed, 14 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e09c7c35086..f071e92992e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -509,6 +509,20 @@ proc rust::old_macos_compatibility {cname cversion} {
</span> cargo.offline_cmd-replace --frozen --offline
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "curl-sys" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on Mac OS X 10.6, clang exists, but `clang --print-search-dirs` returns an empty library directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/alexcrichton/curl-rust/commit/b3a3ce876921f2e82a145d9abd539cd8f9b7ab7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/64146#comment:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on other systems, we want the static library of the compiler we are using and not necessarily the system compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/alexcrichton/curl-rust/commit/a6969c03b1e8f66bc4c801914327176ed38f44c5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/alexcrichton/curl-rust/issues/279
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for upstream pull request, see https://github.com/alexcrichton/curl-rust/pull/451
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|Command::new(\"clang\")|cc::Build::new().get_compiler().to_command()|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cargo.home}/macports/${cname}-${cversion}/build.rs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
<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 fb585c3493c..47f2cdf5ecb 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;'>@@ -202,13 +202,6 @@ subport rust-src {
</span> proc rust::handle_crates {} {}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "rust" && ${os.platform} eq "darwin" && ${os.major} == 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "$subport does not currently build on Mac OS X 10.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url https://github.com/rust-lang/rust/tags
livecheck.regex refs/tags/(\[\\d\\.\]+).zip
</pre><pre style='margin:0'>
</pre>