<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/59b89314e540c319dca639a100ff9faf56eb748a">https://github.com/macports/macports-ports/commit/59b89314e540c319dca639a100ff9faf56eb748a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 59b89314e540c319dca639a100ff9faf56eb748a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 29 22:08:55 2022 -0700

<span style='display:block; white-space:pre;color:#404040;'>    rust: synchronize patches with merged PR
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See https://github.com/rust-lang/rust/pull/105920
</span><span style='display:block; white-space:pre;color:#404040;'>    No revbump since installed files will not change.
</span>---
 lang/rust/Portfile                               |  3 +--
 lang/rust/files/patch-UsingTheRightCompiler.diff | 29 ++++++++++++++++++++++++
 lang/rust/files/patch-configure.py.diff          | 16 -------------
 lang/rust/files/patch-macports_linker.diff       | 17 --------------
 4 files changed, 30 insertions(+), 35 deletions(-)

<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 566aa9d6f20..41450176a4e 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;'>@@ -84,9 +84,8 @@ post-extract {
</span> }
 
 patchfiles-append           patch-offline_bootstrap.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-configure.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-UsingTheRightCompiler.diff \
</span>                             patch-i686_to_i386.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-macports_linker.diff \
</span>                             patch-emulate_tls.diff
 if { ${rust.use_cctools} } {
     patchfiles-append       patch-llvm_libtool.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-UsingTheRightCompiler.diff b/lang/rust/files/patch-UsingTheRightCompiler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d8b34948db
</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-UsingTheRightCompiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/rust-lang/rust/pull/105920
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bootstrap/bootstrap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bootstrap/bootstrap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -752,6 +752,9 @@ def build_bootstrap(self, color):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             target_features += ["-crt-static"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if target_features:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             env["RUSTFLAGS"] += " -C target-feature=" + (",".join(target_features))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        target_linker = self.get_toml("linker", build_section)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if target_linker is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            env["RUSTFLAGS"] += " -C linker=" + target_linker
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         env["RUSTFLAGS"] += " -Wsemicolon_in_expressions_from_macros"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if self.get_toml("deny-warnings", "rust") != "false":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b139decb5551..31cc4aa57bbea 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/bootstrap/configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/bootstrap/configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -405,7 +405,9 @@ def set(key, value):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         configured_targets.append(target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for target in configured_targets:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     targets[target] = sections['target'][:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    targets[target][0] = targets[target][0].replace("x86_64-unknown-linux-gnu", "'{}'".format(target))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    # For `.` to be valid TOML, it needs to be quoted. But `bootstrap.py` doesn't use a proper TOML parser and fails to parse the target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    # Avoid using quotes unless it's necessary.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    targets[target][0] = targets[target][0].replace("x86_64-unknown-linux-gnu", "'{}'".format(target) if "." in target else target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def is_number(value):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-configure.py.diff b/lang/rust/files/patch-configure.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63f8de1074c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/patch-configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Undo https://github.com/rust-lang/rust/commit/1532fd8cd0db93f469e414f9da31ef083a44fcba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[target.'x86_64-apple-darwin'] is not recognized in is not recognized in config.toml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/rust-lang/rust/pull/105920
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bootstrap/configure.py.orig        2022-11-02 07:36:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bootstrap/configure.py     2022-12-17 12:04:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -405,7 +405,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         configured_targets.append(target)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for target in configured_targets:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     targets[target] = sections['target'][:]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--    targets[target][0] = targets[target][0].replace("x86_64-unknown-linux-gnu", "'{}'".format(target))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    targets[target][0] = targets[target][0].replace("x86_64-unknown-linux-gnu", target)
</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;'>- def is_number(value):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/files/patch-macports_linker.diff b/lang/rust/files/patch-macports_linker.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8f4dd39980..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/files/patch-macports_linker.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Undo part of https://github.com/rust-lang/rust/commit/d1291dc8b4ac9a98ff1d286402559e4ba5d68488
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See https://github.com/rust-lang/rust/pull/105920
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bootstrap/bootstrap.py.orig        2022-12-12 09:02:12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bootstrap/bootstrap.py     2022-12-18 19:33:12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -752,6 +752,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             target_features += ["-crt-static"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if target_features:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             env["RUSTFLAGS"] += " -C target-feature=" + (",".join(target_features))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        target_linker = self.get_toml("linker", build_section)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        if target_linker is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            env["RUSTFLAGS"] += " -C linker=" + target_linker
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         env["RUSTFLAGS"] += " -Wsemicolon_in_expressions_from_macros"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         if self.get_toml("deny-warnings", "rust") != "false":
</span></pre><pre style='margin:0'>

</pre>