<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/9848c64cc5dd800b02dd19be5e943843386eb2f3">https://github.com/macports/macports-ports/commit/9848c64cc5dd800b02dd19be5e943843386eb2f3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9848c64cc5dd800b02dd19be5e943843386eb2f3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 29 22:04:23 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust: ensure patch files apply cleanly
</span>---
lang/rust/files/patch-emulate_tls.diff | 2 +-
lang/rust/files/patch-i686_to_i386.diff | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-emulate_tls.diff b/lang/rust/files/patch-emulate_tls.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ddce7299129..0ba9387dc11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/patch-emulate_tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/patch-emulate_tls.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/llvm-project/llvm/include/llvm/ADT/Triple.h.orig 2021-11-16 09:47:26.000000000 -0700
+++ src/llvm-project/llvm/include/llvm/ADT/Triple.h 2022-03-07 19:38:27.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -854,7 +854,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -919,7 +919,7 @@
</span>
/// Tests whether the target uses emulated TLS as default.
bool hasDefaultEmulatedTLS() const {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-i686_to_i386.diff b/lang/rust/files/patch-i686_to_i386.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d418e39d403..b814ddeb308 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/patch-i686_to_i386.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/files/patch-i686_to_i386.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ See https://github.com/rust-lang/rust/pull/105904
</span>
--- src/bootstrap/native.rs.orig 2022-11-02 07:36:24.000000000 -0700
+++ src/bootstrap/native.rs 2022-12-18 07:02:49.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,6 +642,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -674,6 +674,9 @@
</span> if target.starts_with("aarch64") {
// macOS uses a different name for building arm64
cfg.define("CMAKE_OSX_ARCHITECTURES", "arm64");
</pre><pre style='margin:0'>
</pre>