<pre style='margin:0'>
Mark Evenson (easye) pushed a commit to branch revert-6945-rust-1.43.0
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f837b34510dfe40f5ec7cb74e2789b99df2419d1">https://github.com/macports/macports-ports/commit/f837b34510dfe40f5ec7cb74e2789b99df2419d1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f837b34510dfe40f5ec7cb74e2789b99df2419d1
</span>Author: Aljaž Srebrnič <a2piratesoft@gmail.com>
AuthorDate: Sun Apr 26 21:55:02 2020 +0200

<span style='display:block; white-space:pre;color:#404040;'>    Revert "rust: update to 1.43.0, drop i686 support - i686-darwin is listed as Tier 3 support: https://forge.rust-lang.org/release/platform-support.html"
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This reverts commit 8aa429ba73845ced50d6e629bdfc681f010bcfaf.
</span>---
 lang/rust/Portfile | 227 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 179 insertions(+), 48 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 4784f43..4dc138c 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;'>@@ -1,13 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=portfile:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           active_variants 1.1
</span> 
 name                rust
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.43.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.42.0
</span> revision            0
 categories          lang devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs     x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs     i386 x86_64
</span> license             {MIT Apache-2} BSD zlib NCSA Permissive
 maintainers         {g5pw @g5pw} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +27,9 @@ long_description    Rust is a curly-brace, block-structured expression \
</span> homepage            https://www.rust-lang.org/
 
 # Get from src/stage0.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ruststd_version 1.42.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set rustc_version   1.42.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set cargo_version   0.43.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ruststd_version 1.41.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rustc_version   1.41.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cargo_version   0.42.0
</span> set llvm_version    9.0
 
 # can use cmake or cmake-devel; default to cmake.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,28 +44,61 @@ distname            ${name}c-${version}-src
</span> 
 patchfiles          patch-src-librustc-llvm-lib.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append    rust-std-${ruststd_version}-${build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rustc-${rustc_version}-${build_arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    cargo-${cargo_version}-${build_arch}-apple-${os.platform}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set architectures i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set architectures ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set architectures {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend architectures i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend architectures ${arch}
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    distfiles-append rust-std-${ruststd_version}-${arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     rustc-${rustc_version}-${arch}-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     cargo-${cargo_version}-${arch}-apple-${os.platform}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  994ef055d958f38d23a70575884e2fcb058003f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  75f6ac6c9da9f897f4634d5a07be4084692f7ccc2d2bb89337be86cfc18453a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    136038757
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  3b35f1542ef4eee65403f90194d92745acecdd29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  d2e8f931d16a0539faaaacd801e0d92c58df190269014b2360c6ab2a90ee3475 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    135735490
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rust-std-${ruststd_version}-i686-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  289028f8a0b68b91e01681d579bbee2d4186e136 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  f76796588fb5dd3b070bff005ed190d3053be5c77f245985d43406b8891016d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    21329270 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rustc-${rustc_version}-i686-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  36de99d7358b40e87a1ac8b662cff7177092e312 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  e4732fb1f8b0a44690573e26b81fce01eb6a993ba66f05e6c79d4c1b3565a47d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    80109236 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    cargo-${cargo_version}-i686-apple-${os.platform}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  545f39de16b7e7ae987dee80dfeb48d0588917fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  62f5219792a27de6c5d141c59f05dee252424b7ce9671cefbb1227cab15da91e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    5241962
</span> 
 checksums-append \
                     rust-std-${ruststd_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  b6a5f43438bedda5415722acd87cd93871c43116 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  1d61e9ed5d29e1bb4c18e13d551c6d856c73fb8b410053245dc6e0d3b3a0e92c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    22972985 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  6b90224938a5d54ae7f1814732cb9dd9ec0615ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  6f4058d48027c1a0b8c04f1de3d86c8695b470850b60555b659f8f06adc2c447 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    21405237 \
</span>                     rustc-${rustc_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  9cdf25b0b539943b752563c67a4467cf710baf8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  778dea93d7e46261e2c06cadec35b68f9857604f279ce6fbd1b37c1a89634625 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    83826769 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  ae50678e13778051ae6455ac79e1b1cc659e2f8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  ec3e8b3fc11cb4e781724f0556c4e64c46a50bfb014b104ee7f200169804df0c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    82763438 \
</span>                     cargo-${cargo_version}-x86_64-apple-${os.platform}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  be99fef6ddeb53590b0f3976ff2d60d6c01b0923 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  92d4c9fb4747dce158cdfb773651aea8eac894277f3a2de5aa2c3b9d92439d8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    5375241
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  095c410db6434c1efbf297068426c74a2bc6db9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  9633707ec7d83c02664e74040601e4d78488d8521de4400e9881d7c57594e49f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    5371783
</span> 
 if {${os.platform} eq "darwin" && ${os.major} < 11} {
     known_fail yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,28 +109,105 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> }
 
 post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set rust_root     ${worksrcpath}/build/stage0-${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set rust_platform ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file mkdir ${rust_root}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "cp -r ${workpath}/rust-std-${ruststd_version}-${rust_platform}/rust-std-${rust_platform}/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "cp -r ${workpath}/rustc-${rustc_version}-${rust_platform}/rustc/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "cp -r ${workpath}/cargo-${cargo_version}-${rust_platform}/cargo/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_root     ${worksrcpath}/build/stage0-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file mkdir ${rust_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "cp -r ${workpath}/rust-std-${ruststd_version}-${rust_platform}/rust-std-${rust_platform}/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "cp -r ${workpath}/rustc-${rustc_version}-${rust_platform}/rustc/* ${rust_root}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "cp -r ${workpath}/cargo-${cargo_version}-${rust_platform}/cargo/* ${rust_root}"
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args      --enable-vendor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --default-linker=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-codegen-tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --release-channel=stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/56351
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/rust-lang/rust/issues/50220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # LLVM is or will need to be universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set copy_llvm 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {set result [active_variants llvm-${llvm_version} "universal" ""]}] && $result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # LLVM was installed with universal variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set copy_llvm 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set copy_llvm 0
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!${copy_llvm}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # LLVM is NOT universal, so use installed version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        --llvm-root=${prefix}/libexec/llvm-${llvm_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # copy LLVM and thin static libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://trac.macports.org/ticket/56351
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://github.com/rust-lang/rust/issues/50220
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set archs ${universal_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                --llvm-root=${workpath}/llvm-${llvm_version}-${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set archs ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            --llvm-root=${workpath}/llvm-${llvm_version}-${build_arch}
</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;'>+    depends_extract-append  port:llvm-${llvm_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            system -W ${workpath} "cp -R ${prefix}/libexec/llvm-${llvm_version} ${workpath}/llvm-${llvm_version}-${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fs-traverse f ${workpath}/llvm-${llvm_version}-${arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[file isfile $f] && [file type $f]!="link" && [file extension $f]==".a"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    catch {system "lipo -thin ${arch} ${f} -o ${f}"}
</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;'>+        }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set rust_root     ${worksrcpath}/build/stage0-${arch_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   --local-rust-root=${rust_root}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_platform ${arch_name}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_root     ${worksrcpath}/build/stage0-${arch_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lappend merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  --local-rust-root=${rust_root}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --set=target.${rust_platform}.cc=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --set=target.${rust_platform}.cxx=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --set=target.${rust_platform}.linker=${configure.cc}
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set rust_platform       ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set rust_root           ${worksrcpath}/build/stage0-${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args          --enable-vendor \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --default-linker=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --disable-codegen-tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --disable-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --release-channel=stable \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --llvm-root=${prefix}/libexec/llvm-${llvm_version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --build=${rust_platform} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --local-rust-root=${rust_root} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --set=target.${rust_platform}.cc=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --set=target.${rust_platform}.cxx=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        --set=target.${rust_platform}.linker=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete --disable-dependency-tracking
</span> 
 post-configure {
     # the bootstrap call to rustc uses cc for the linker
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,11 +215,11 @@ post-configure {
</span>     # see https://trac.macports.org/wiki/UsingTheRightCompiler
     xinstall -d -m 0755 ${workpath}/.home/.cargo
     set config [open ${workpath}/.home/.cargo/config w]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set rust_platform ${build_arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts ${config} "\[target.${rust_platform}\]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    puts ${config} "linker = \"${configure.cc}\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach arch ${architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set rust_platform ${arch}-apple-${os.platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        puts ${config} "\[target.${rust_platform}\]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        puts ${config} "linker = \"${configure.cc}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     close ${config}
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,15 +230,34 @@ test.target         check
</span> test.args           VERBOSE=1
 
 destroot.args       VERBOSE=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set arch_name ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-destroot {
</span>         xinstall -d ${destroot}${prefix}/share/${name}
         xinstall -m 644 ${worksrcpath}/src/etc/ctags.rust \
             ${destroot}${prefix}/share/${name}
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {${arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set arch_name i686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set arch_name ${arch}
</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;'>+                xinstall -d ${destroot}-${arch}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                xinstall -m 644 ${worksrcpath}-${arch}/src/etc/ctags.rust \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${destroot}-${arch}${prefix}/share/${name}
</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;'>+    }
</span> }
 
 livecheck.type      regex
</pre><pre style='margin:0'>

</pre>