<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f0fa9e72fab78f57371850b73e903a5995beea2">https://github.com/macports/macports-ports/commit/6f0fa9e72fab78f57371850b73e903a5995beea2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6f0fa9e72fab78f57371850b73e903a5995beea2
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Sep 4 18:50:44 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> mrustc: update to 20220904
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It also fixed build mrustc-rust on 10.7 and 10.14
</span>---
lang/mrustc/Portfile | 20 ++++++++++++--------
...roduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch | 4 ++--
...-curl-sys-never-try-to-link-with-lib-darwin.patch | 4 ++--
...ys-use-src-instead-.git-as-vendored-indicat.patch | 5 ++---
...ys-use-src-instead-.git-as-vendored-indicat.patch | 5 ++---
...t2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch | 4 ++--
...patch => 0006-macOS-10.7-Switch-to-OpenSSL.patch} | 10 +++++-----
...S-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch} | 6 +++---
...> 0008-macOS-10.6-Fix-pthread_cond_destroy.patch} | 6 +++---
9 files changed, 33 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/Portfile b/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0988cba889d..dde4770e24c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,14 +5,14 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup thepowersgang mrustc bf313192a66e783daa262b64378af99c25cfb3b9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup thepowersgang mrustc a04f166ea5762037895738d88d144803e2e433f5
</span>
set rust_version 1.54.0
set rust_version_major [join [lrange [split ${rust_version} .-] 0 1] .]
set rust_version_major_underscore [join [lrange [split ${rust_version} .-] 0 1] _]
# subport mrustc-rust has its own versioning
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${rust_version_major}-20220830
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${rust_version_major}-20220904
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ master_sites-append https://static.rust-lang.org/dist/:rust
</span> distfiles-append rustc-${rust_version}-src.tar.gz:rust
checksums mrustc-${github.version}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 77521687f5db2ba7b2ee0283be2c739c019ece4d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b4d622e89ecb55929b219026d66ea7e1ef34ace921298b56baa18163dcde6bd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1189530 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d608075c56b6aa8175b25016ff0e64190f5e94cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4d25c6e55d8b1c05a87a408a9edbdd5ec8416f40be660619442e12e0d23356af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1189691 \
</span> rustc-${rust_version}-src.tar.gz \
rmd160 be2de16e2deaf91aee723e631a36f6de52636ddd \
sha256 ac8511633e9b5a65ad030a1a2e5bdaa841fdfe3132f2baaa52cc04e71c6c6976 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,13 +96,17 @@ patchfiles 0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch \
</span> 0004-libssh2-sys-use-src-instead-.git-as-vendored-indicat.patch \
0005-libgit2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-macOS-10.7-Switch-to-OpenSSL.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
PortGroup active_variants 1.1
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-macOS-10.6-Fix-pthread_cond_destroy.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0008-macOS-10.6-Switch-to-OpenSSL.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-macOS-10.6-Fix-pthread_cond_destroy.patch
</span>
set libemutls ${workpath}/libemutls
set libemutls_a ${libemutls}/libemutls.a
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch b/lang/mrustc/files/0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cfd2fc4e7fe..d09c37fd3dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 59461f577c356f685ff398bb9d8b5128dbb9fedd Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Tue, 8 Feb 2022 04:07:30 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/8] Introduced support of `MACPORTS_LEGACY_SUPPORT_*`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Introduced support of `MACPORTS_LEGACY_SUPPORT_*`
</span>
MacPorts defines `MACPORTS_LEGACY_SUPPORT_ENABLED` with value `1` when
port should link against LegacySupport.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,5 +42,5 @@ index a14ac63c7a..f481ffd176 100644
</span> let target = env::var("TARGET").expect("TARGET was not set");
if target.contains("freebsd") {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0002-curl-sys-never-try-to-link-with-lib-darwin.patch b/lang/mrustc/files/0002-curl-sys-never-try-to-link-with-lib-darwin.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f8bccbe1df..1d171d54932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0002-curl-sys-never-try-to-link-with-lib-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0002-curl-sys-never-try-to-link-with-lib-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From 21bedbb14739809ba4ec247f22632ee3cca64c55 Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Wed, 9 Feb 2022 05:47:47 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/8] `curl-sys`: never try to link with `/lib/darwin`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] `curl-sys`: never try to link with `/lib/darwin`
</span>
`clang --print-search-dirs` may return `libraries: =` that leads to
`/lib/darwin` which may leads to attempt to find `clang_rt.osx` inside
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +26,5 @@ index 64df41e995..3213c66b33 100644
</span> }
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0003-libgit2-sys-use-src-instead-.git-as-vendored-indicat.patch b/lang/mrustc/files/0003-libgit2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index dc047c7d3e5..b53588a14e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0003-libgit2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0003-libgit2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,7 @@
</span> From 1e6d35d907ead0504a634082d5971b41dae67b7c Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Mon, 7 Feb 2022 01:37:13 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/8] `libgit2-sys`: use `src` instead `.git` as vendored
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- indicator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] `libgit2-sys`: use `src` instead `.git` as vendored indicator
</span>
When someone vendored `libgit2-sys` he may exclude `.git` folder.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,5 +31,5 @@ index 76aa687cf6..9ea69e171c 100644
</span> .args(&["submodule", "update", "--init", "libgit2"])
.status();
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0004-libssh2-sys-use-src-instead-.git-as-vendored-indicat.patch b/lang/mrustc/files/0004-libssh2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 995057715d7..6bed5fdc5e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0004-libssh2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0004-libssh2-sys-use-src-instead-.git-as-vendored-indicat.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,7 @@
</span> From d06c3e59c01b9c15d35464f02d163d1ef07abe8f Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 10 Feb 2022 00:53:41 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 4/8] `libssh2-sys`: use `src` instead `.git` as vendored
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- indicator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] `libssh2-sys`: use `src` instead `.git` as vendored indicator
</span>
When someone vendored `libssh-sys` he may exclude `.git` folder.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,5 +25,5 @@ index 215014864b..235bc16cd7 100644
</span> .args(&["submodule", "update", "--init"])
.status();
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0005-libgit2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch b/lang/mrustc/files/0005-libgit2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index eca3a75b4c8..2f1b5e6f20c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0005-libgit2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0005-libgit2-sys-recovered-LIBGIT2_SYS_USE_PKG_CONFIG.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> From e16148f9bab7a71032bbf245c8fc1dcafa2efd62 Mon Sep 17 00:00:00 2001
From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 10 Feb 2022 02:07:33 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 5/8] `libgit2-sys`: recovered `LIBGIT2_SYS_USE_PKG_CONFIG`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] `libgit2-sys`: recovered `LIBGIT2_SYS_USE_PKG_CONFIG`
</span>
---
vendor/libgit2-sys/build.rs | 2 +-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,5 +21,5 @@ index 9ea69e171c..e30a09b44a 100644
</span> if let Ok(lib) = cfg.atleast_version("1.1.0").probe("libgit2") {
for include in &lib.include_paths {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0008-macOS-10.6-Switch-to-OpenSSL.patch b/lang/mrustc/files/0006-macOS-10.7-Switch-to-OpenSSL.patch
</span>similarity index 92%
rename from lang/mrustc/files/0008-macOS-10.6-Switch-to-OpenSSL.patch
rename to lang/mrustc/files/0006-macOS-10.7-Switch-to-OpenSSL.patch
<span style='display:block; white-space:pre;color:#808080;'>index fefb478050d..aa245e69ce1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0008-macOS-10.6-Switch-to-OpenSSL.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0006-macOS-10.7-Switch-to-OpenSSL.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1713faf9ef2750e690e134f0cb51796b87f7b50f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 91a823edc714105c8900632147cebfc176ca003d Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 5 Feb 2022 23:21:39 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 8/8] macOS 10.6: Switch to OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 3 Sep 2022 19:06:22 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macOS 10.7: Switch to OpenSSL
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-macOS before 10.7 requires to use OpenSSL because a lot of things is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS before 10.8 requires to use OpenSSL because a lot of things is
</span> simple missed.
---
vendor/crypto-hash/Cargo.toml | 4 ++--
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,5 +73,5 @@ index e30a09b44a..a5af5eec64 100644
</span> features.push_str("#define GIT_OPENSSL 1\n");
if let Some(path) = env::var_os("DEP_OPENSSL_INCLUDE") {
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0006-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch b/lang/mrustc/files/0007-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch
</span>similarity index 99%
rename from lang/mrustc/files/0006-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch
rename to lang/mrustc/files/0007-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch
<span style='display:block; white-space:pre;color:#808080;'>index 6fe9f65edf3..9d2648da2ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0006-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0007-macOS-10.6-enforce-emulated-TLS-via-LLVM-Clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9dc1c672f413a45c2db040afd2a875e4edf83872 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e6284ce2c30fb0bfde60468d3a46d8d44953fc8e Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Sat, 23 Jul 2022 14:09:34 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 6/8] macOS 10.6: enforce emulated TLS via LLVM/Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macOS 10.6: enforce emulated TLS via LLVM/Clang
</span>
---
Cargo.lock | 1 +
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -435,5 +435,5 @@ index f1bd8ff237..137da31496 100644
</span> target_option_val!(forces_embed_bitcode);
target_option_val!(bitcode_llvm_cmdline);
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mrustc/files/0007-macOS-10.6-Fix-pthread_cond_destroy.patch b/lang/mrustc/files/0008-macOS-10.6-Fix-pthread_cond_destroy.patch
</span>similarity index 89%
rename from lang/mrustc/files/0007-macOS-10.6-Fix-pthread_cond_destroy.patch
rename to lang/mrustc/files/0008-macOS-10.6-Fix-pthread_cond_destroy.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4c1929f50bd..31e912c8b13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mrustc/files/0007-macOS-10.6-Fix-pthread_cond_destroy.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mrustc/files/0008-macOS-10.6-Fix-pthread_cond_destroy.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From f201284935125d2e12666b56530fbc8be5010de4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ac26fb414f4a2c84da35c793a80560c0b63682b2 Mon Sep 17 00:00:00 2001
</span> From: "Kirill A. Korinsky" <kirill@korins.ky>
Date: Thu, 17 Feb 2022 15:12:11 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 7/8] macOS 10.6: Fix `pthread_cond_destroy`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] macOS 10.6: Fix `pthread_cond_destroy`
</span>
macOS 10.7 returns `EINVAL` for `pthread_cond_destroy()`.
---
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,5 +30,5 @@ index e38f91af9f..c03c22b2cf 100644
</span> let r = libc::pthread_cond_destroy(self.inner.get());
// On DragonFly pthread_cond_destroy() returns EINVAL if called on
--
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.37.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.2
</span>
</pre><pre style='margin:0'>
</pre>