<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3ad578f49ca7b6cacc4dbb8913328cdbe475b5d4">https://github.com/macports/macports-ports/commit/3ad578f49ca7b6cacc4dbb8913328cdbe475b5d4</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 3ad578f49ca rust: fix build on ac OS X Leopard
</span>3ad578f49ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3ad578f49ca7b6cacc4dbb8913328cdbe475b5d4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Dec 28 10:01:07 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust: fix build on ac OS X Leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libdispatch was introduced in 10.6, so use pthread instead.
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
lang/rust/Portfile | 4 +++-
lang/rust/files/patch-no_libdispatch.diff | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
<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 4513555a635..15996e9d2d1 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;'>@@ -94,7 +94,9 @@ if { ${rust.use_cctools} } {
</span> }
if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
# CFURLSetResourcePropertyForKey was introduced in 10.6, so turn off the (optional) function that uses it
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_CFURLSetResourcePropertyForKey.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libdispatch was introduced in 10.6, so use pthread instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-no_CFURLSetResourcePropertyForKey.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no_libdispatch.diff
</span> }
if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
# revert https://github.com/llvm/llvm-project/commit/9902a0945d22cd5757b16ebe85fe07059723aa09
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-no_libdispatch.diff b/lang/rust/files/patch-no_libdispatch.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8fa28712a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/patch-no_libdispatch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libdispatch was first released with Mac OS X 10.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://en.wikipedia.org/wiki/Grand_Central_Dispatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/rust-lang/rust/commit/99182dd8058f0a1153b8b7fcf873028caa6fbfa7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- library/std/src/sys/unix/thread_parker/mod.rs.orig 2022-12-12 09:02:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ library/std/src/sys/unix/thread_parker/mod.rs 2022-12-26 20:54:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,8 +20,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ not(miri),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ))] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mod darwin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pub use darwin::Parker;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mod pthread;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pub use pthread::Parker;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if #[cfg(target_os = "netbsd")] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mod netbsd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pub use netbsd::Parker;
</span></pre><pre style='margin:0'>
</pre>