aboutsummaryrefslogtreecommitdiff
path: root/lang/rust
diff options
context:
space:
mode:
authorpouet <mikael.urankar@gipsa-lab.grenoble-inp.fr>2021-08-28 12:24:50 +0000
committerMikael Urankar <mikael@FreeBSD.org>2021-08-28 13:38:37 +0000
commit55dbddeb07345c55bdc6d4d09c3bf6f3409ab0f5 (patch)
treecf8408ccf1cab3a459ac03059700844e341dc169 /lang/rust
parentbbdb4cc35687ba4ebe9362044e02f93167437b9f (diff)
downloadports-55dbddeb07345c55bdc6d4d09c3bf6f3409ab0f5.tar.gz
ports-55dbddeb07345c55bdc6d4d09c3bf6f3409ab0f5.zip
lang/rust: Update to 1.54.0
- Update lang/rust to 1.54.0 - Update devel/racer to 2.1.48 - Fix various consumers Changes: https://blog.rust-lang.org/2021/07/29/Rust-1.54.0.html Reviewed by: tobik, pkubaj Differential Revision: https://reviews.freebsd.org/D31617 With hat: rust
Diffstat (limited to 'lang/rust')
-rw-r--r--lang/rust/Makefile6
-rw-r--r--lang/rust/distinfo114
-rw-r--r--lang/rust/files/patch-library_stdarch_crates_std__detect_src_detect_os_freebsd_aarch64.rs10
-rw-r--r--lang/rust/files/patch-src_bootstrap_install.rs8
-rw-r--r--lang/rust/files/patch-vendor_openssl-sys_build_main.rs17
5 files changed, 72 insertions, 83 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 90fe2ce2fbfa..77476313a0dc 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,7 +1,7 @@
# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
PORTNAME= rust
-PORTVERSION?= 1.53.0
+PORTVERSION?= 1.54.0
PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
@@ -62,8 +62,8 @@ WASM_VARS= _RUST_BUILD_WASM=true \
WASM_VARS_OFF= _RUST_BUILD_WASM=false
# See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?= 2021-05-10
-RUST_BOOTSTRAP_VERSION?= 1.52.1
+BOOTSTRAPS_DATE?= 2021-06-17
+RUST_BOOTSTRAP_VERSION?= 1.53.0
BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}}
BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl}
diff --git a/lang/rust/distinfo b/lang/rust/distinfo
index 9056af6917f5..68bb36c9db71 100644
--- a/lang/rust/distinfo
+++ b/lang/rust/distinfo
@@ -1,57 +1,57 @@
-TIMESTAMP = 1624031642
-SHA256 (rust/rustc-1.53.0-src.tar.xz) = e53a2df2c2c26f8929d551852eeae242b9a6167fba34481f92010b30def32dec
-SIZE (rust/rustc-1.53.0-src.tar.xz) = 115686332
-SHA256 (rust/2021-05-10/rustc-1.52.1-aarch64-unknown-freebsd.tar.xz) = db5990320065ee8898a7094b99c373a2a355ce2509282611809c750ed5129b02
-SIZE (rust/2021-05-10/rustc-1.52.1-aarch64-unknown-freebsd.tar.xz) = 44941036
-SHA256 (rust/2021-05-10/rust-std-1.52.1-aarch64-unknown-freebsd.tar.xz) = b47423a1836b0ba69d71a0b0f90e6f9c7106c09de038a7fad1e138a89a9a98e2
-SIZE (rust/2021-05-10/rust-std-1.52.1-aarch64-unknown-freebsd.tar.xz) = 17228492
-SHA256 (rust/2021-05-10/cargo-1.52.1-aarch64-unknown-freebsd.tar.xz) = 36e1ba6cd275d0e5795265e12e92653ed6251144249b2e56230d4e40d6825c1b
-SIZE (rust/2021-05-10/cargo-1.52.1-aarch64-unknown-freebsd.tar.xz) = 4364328
-SHA256 (rust/2021-05-10/rustc-1.52.1-x86_64-unknown-freebsd.tar.xz) = 6a00cd20cea8f851f1232bea263a3e77689f6f253d921f81160a9ce0da1a8cab
-SIZE (rust/2021-05-10/rustc-1.52.1-x86_64-unknown-freebsd.tar.xz) = 40846844
-SHA256 (rust/2021-05-10/rust-std-1.52.1-x86_64-unknown-freebsd.tar.xz) = 525c2bb01d652e692e5b54eeca34d7288ab6de29a642674df6fd3703cc481b0f
-SIZE (rust/2021-05-10/rust-std-1.52.1-x86_64-unknown-freebsd.tar.xz) = 21166580
-SHA256 (rust/2021-05-10/cargo-1.52.1-x86_64-unknown-freebsd.tar.xz) = 7db91dc33459615bd4284d02756b1f1be25c6cb7002b296da5e5cc1ac66bb9c4
-SIZE (rust/2021-05-10/cargo-1.52.1-x86_64-unknown-freebsd.tar.xz) = 5110192
-SHA256 (rust/2021-05-10/rustc-1.52.1-armv6-unknown-freebsd.tar.xz) = b509b8ac6ce5c7adef573a5eb29464cb7f5b08a99e73f0e597a3ee1a41bb1e8a
-SIZE (rust/2021-05-10/rustc-1.52.1-armv6-unknown-freebsd.tar.xz) = 45745500
-SHA256 (rust/2021-05-10/rust-std-1.52.1-armv6-unknown-freebsd.tar.xz) = 7a1996b52a54f4c20b10cc6af64232289a5512814fd3c3b168e6f310aca601fb
-SIZE (rust/2021-05-10/rust-std-1.52.1-armv6-unknown-freebsd.tar.xz) = 17089672
-SHA256 (rust/2021-05-10/cargo-1.52.1-armv6-unknown-freebsd.tar.xz) = 8d2d251431f74148b74d430ecd87fd2cac874aae1711e1e618558dc1e8b92a28
-SIZE (rust/2021-05-10/cargo-1.52.1-armv6-unknown-freebsd.tar.xz) = 4493480
-SHA256 (rust/2021-05-10/rustc-1.52.1-armv7-unknown-freebsd.tar.xz) = 24296e541dcaf17a26c9e3359a0334402f170a52cda0c94e86f1db37d920d44f
-SIZE (rust/2021-05-10/rustc-1.52.1-armv7-unknown-freebsd.tar.xz) = 45687832
-SHA256 (rust/2021-05-10/rust-std-1.52.1-armv7-unknown-freebsd.tar.xz) = 1d3776e5a51e7615d7dd513b917a87131c9372f72ca48b8cb5ec630eb5befca2
-SIZE (rust/2021-05-10/rust-std-1.52.1-armv7-unknown-freebsd.tar.xz) = 17299848
-SHA256 (rust/2021-05-10/cargo-1.52.1-armv7-unknown-freebsd.tar.xz) = 72ac9e6c4f575aa8db9150e8f2df179d8767d951a92e86bfc7c6bd8197102a3a
-SIZE (rust/2021-05-10/cargo-1.52.1-armv7-unknown-freebsd.tar.xz) = 4483100
-SHA256 (rust/2021-05-10/rustc-1.52.1-i686-unknown-freebsd.tar.xz) = bcb0633b11800b7c4fa37e7c11768a67530afa77c7fcab90ed1f22281ac81868
-SIZE (rust/2021-05-10/rustc-1.52.1-i686-unknown-freebsd.tar.xz) = 48639596
-SHA256 (rust/2021-05-10/rust-std-1.52.1-i686-unknown-freebsd.tar.xz) = 104efbbcada537f1129a61b9d781001836b4dd4cebcc8ab0e6ebf3492ae41ec5
-SIZE (rust/2021-05-10/rust-std-1.52.1-i686-unknown-freebsd.tar.xz) = 21189280
-SHA256 (rust/2021-05-10/cargo-1.52.1-i686-unknown-freebsd.tar.xz) = c44859c142c4df17a0e29c0dba5b146fcc8de3211dde37a48a64743cb374f505
-SIZE (rust/2021-05-10/cargo-1.52.1-i686-unknown-freebsd.tar.xz) = 5154628
-SHA256 (rust/2021-05-10/rustc-1.52.1-powerpc-unknown-freebsd.tar.xz) = b7b57482405486d714084a141ed355cfec1dc5255d0a89738da3958de58373d8
-SIZE (rust/2021-05-10/rustc-1.52.1-powerpc-unknown-freebsd.tar.xz) = 46917676
-SHA256 (rust/2021-05-10/rust-std-1.52.1-powerpc-unknown-freebsd.tar.xz) = 5f367cf52016dddec10feb6f443ddec889017ee0dc91b1137cb4ccf16a103ca6
-SIZE (rust/2021-05-10/rust-std-1.52.1-powerpc-unknown-freebsd.tar.xz) = 16745916
-SHA256 (rust/2021-05-10/cargo-1.52.1-powerpc-unknown-freebsd.tar.xz) = 5390b24382e1b5a17e78d1a569288772b38d2dc562abb77a2eafc7c63d773ac2
-SIZE (rust/2021-05-10/cargo-1.52.1-powerpc-unknown-freebsd.tar.xz) = 4912240
-SHA256 (rust/2021-05-10/rustc-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 8471da344ec65c9ed14695f2fb21d917c1365a7ec16cd42429ee4a3dc3482301
-SIZE (rust/2021-05-10/rustc-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 55560892
-SHA256 (rust/2021-05-10/rust-std-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = dec922c48865d9ebfcfbefb81b36e54096798d85c89faa9f699ee23d24206438
-SIZE (rust/2021-05-10/rust-std-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16996816
-SHA256 (rust/2021-05-10/cargo-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 568b5941ef243839529811132d924c0d53e5f29dd966e276f79f196fe703ccc0
-SIZE (rust/2021-05-10/cargo-1.52.1-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4977068
-SHA256 (rust/2021-05-10/rustc-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = ba0044e6c03a832fc43a31055d7b880270fdecdd599b9f9acf1aedff31970f84
-SIZE (rust/2021-05-10/rustc-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = 48166508
-SHA256 (rust/2021-05-10/rust-std-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = f912b6ec961266c93eaaf8b3e48e714701ce117029072a65d65e03c0b865f803
-SIZE (rust/2021-05-10/rust-std-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = 17102052
-SHA256 (rust/2021-05-10/cargo-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = 789dec2c031fb89a80525017c22f51f05da3dbbb558b5f623e55ab0f50aaca8b
-SIZE (rust/2021-05-10/cargo-1.52.1-powerpc64le-unknown-freebsd.tar.xz) = 4910208
-SHA256 (rust/2021-05-10/rustc-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7250fc37fb00d6a9c4f40aa25581e8b0d02a4ad66bcf941497c96314774d5d8a
-SIZE (rust/2021-05-10/rustc-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 46180492
-SHA256 (rust/2021-05-10/rust-std-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = a6702ec714e445e5c14b17f7acbf696b97e3a755ee8863ba919a87ef658033d0
-SIZE (rust/2021-05-10/rust-std-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16924328
-SHA256 (rust/2021-05-10/cargo-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = e96ed74c63003c64581f9d3265be18cae439f947c6008a13ea214245f957a1b9
-SIZE (rust/2021-05-10/cargo-1.52.1-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4664628
+TIMESTAMP = 1629292249
+SHA256 (rust/rustc-1.54.0-src.tar.xz) = a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4
+SIZE (rust/rustc-1.54.0-src.tar.xz) = 116286856
+SHA256 (rust/2021-06-17/rustc-1.53.0-aarch64-unknown-freebsd.tar.xz) = e34bc2850c1e76cc8e0e5dda656694f2e2e6284f66e93fc5cb2479ba8b1cccbb
+SIZE (rust/2021-06-17/rustc-1.53.0-aarch64-unknown-freebsd.tar.xz) = 45271048
+SHA256 (rust/2021-06-17/rust-std-1.53.0-aarch64-unknown-freebsd.tar.xz) = a035ef383a9122e9cc30ba5975bbecc7cd6a134b9b8380bab2a18a8eeac399f7
+SIZE (rust/2021-06-17/rust-std-1.53.0-aarch64-unknown-freebsd.tar.xz) = 17196428
+SHA256 (rust/2021-06-17/cargo-1.53.0-aarch64-unknown-freebsd.tar.xz) = e96ccd334ebbb679ac1f2da6e09b28c68b82661c2159e3b9190719359e0ec4f7
+SIZE (rust/2021-06-17/cargo-1.53.0-aarch64-unknown-freebsd.tar.xz) = 4401588
+SHA256 (rust/2021-06-17/rustc-1.53.0-x86_64-unknown-freebsd.tar.xz) = 853010d8748f4851b394898888d99a89805f74bb9476ee729b89b4b6e3d8a009
+SIZE (rust/2021-06-17/rustc-1.53.0-x86_64-unknown-freebsd.tar.xz) = 40967620
+SHA256 (rust/2021-06-17/rust-std-1.53.0-x86_64-unknown-freebsd.tar.xz) = 84a6ae0cc5da6490c0423c7cd5066c8de6957e9e6e6f272a7b23469f306d1857
+SIZE (rust/2021-06-17/rust-std-1.53.0-x86_64-unknown-freebsd.tar.xz) = 22646668
+SHA256 (rust/2021-06-17/cargo-1.53.0-x86_64-unknown-freebsd.tar.xz) = ad9501ba9511813d135eb7f803f75b59497f02ecb04e3d44674d43782326d70f
+SIZE (rust/2021-06-17/cargo-1.53.0-x86_64-unknown-freebsd.tar.xz) = 5155176
+SHA256 (rust/2021-06-17/rustc-1.53.0-armv6-unknown-freebsd.tar.xz) = 6a519885a99a7852c6cfbce7432235ddcd76c2ecd4c7d41f2bd0ab6e5decd9e4
+SIZE (rust/2021-06-17/rustc-1.53.0-armv6-unknown-freebsd.tar.xz) = 46405940
+SHA256 (rust/2021-06-17/rust-std-1.53.0-armv6-unknown-freebsd.tar.xz) = 854d6bab840963326cbc96a2595a13d330a49b74661f3494398558b27c21315f
+SIZE (rust/2021-06-17/rust-std-1.53.0-armv6-unknown-freebsd.tar.xz) = 17134736
+SHA256 (rust/2021-06-17/cargo-1.53.0-armv6-unknown-freebsd.tar.xz) = 82f1c9f977a22d245a399fb901e35e3ae1aa78ccd20652aad0a568709316ce4d
+SIZE (rust/2021-06-17/cargo-1.53.0-armv6-unknown-freebsd.tar.xz) = 4544880
+SHA256 (rust/2021-06-17/rustc-1.53.0-armv7-unknown-freebsd.tar.xz) = e784383ae7ce49c568d75d02c4c858d984c6a521acfa54d1003ae645b72a7686
+SIZE (rust/2021-06-17/rustc-1.53.0-armv7-unknown-freebsd.tar.xz) = 46399456
+SHA256 (rust/2021-06-17/rust-std-1.53.0-armv7-unknown-freebsd.tar.xz) = d1542d274cfb0b8d6c1b29bb93d748fad0199dcb9110d90d0f3d2d69afa26d5f
+SIZE (rust/2021-06-17/rust-std-1.53.0-armv7-unknown-freebsd.tar.xz) = 17304176
+SHA256 (rust/2021-06-17/cargo-1.53.0-armv7-unknown-freebsd.tar.xz) = 55b0c7d619785ea8873b77a018a610f03b06f911f3051addceee49482fe7e4cb
+SIZE (rust/2021-06-17/cargo-1.53.0-armv7-unknown-freebsd.tar.xz) = 4533940
+SHA256 (rust/2021-06-17/rustc-1.53.0-i686-unknown-freebsd.tar.xz) = 7539cbbc6c0066ebace7aada572020f899f830cc247864e77c7c15d739077c8a
+SIZE (rust/2021-06-17/rustc-1.53.0-i686-unknown-freebsd.tar.xz) = 48599256
+SHA256 (rust/2021-06-17/rust-std-1.53.0-i686-unknown-freebsd.tar.xz) = b2a47cfbe9cec9b3e91abd9bcb8df9d8bf67f790dd73e60d9cca43502dff4402
+SIZE (rust/2021-06-17/rust-std-1.53.0-i686-unknown-freebsd.tar.xz) = 22529204
+SHA256 (rust/2021-06-17/cargo-1.53.0-i686-unknown-freebsd.tar.xz) = 7e6cd0c5c02b0168d77f93d2564dc204141b70e1c883eb86b6c57743b0595c36
+SIZE (rust/2021-06-17/cargo-1.53.0-i686-unknown-freebsd.tar.xz) = 5205264
+SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc-unknown-freebsd.tar.xz) = 6b8b3b715dfe97cab4ef0791d75dfdbdf50dacaeff4010751d035b3deda83150
+SIZE (rust/2021-06-17/rustc-1.53.0-powerpc-unknown-freebsd.tar.xz) = 47256744
+SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc-unknown-freebsd.tar.xz) = 450463c4063d5a82c0d8ee73cae4de8e855ff76f53c8a1cf3ed04b8615d38e74
+SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc-unknown-freebsd.tar.xz) = 16767420
+SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc-unknown-freebsd.tar.xz) = 029392eabed33aadf6294e4f1d42ecf8226e187a4873242a791bfcf5e6844ef3
+SIZE (rust/2021-06-17/cargo-1.53.0-powerpc-unknown-freebsd.tar.xz) = 4949280
+SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 8d03cc993c0b799b66517ae11f050830f25b7a93a4c337b1bf4ffcad0d9099fe
+SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 55399432
+SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 284b8849990df55c540b86f46d306af1960f364b263f1474ecc317f7a741f6bd
+SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16998160
+SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e1fb85decdcc10317fff06ccf350b5a57303dcd719df50979f38447b7020ca1f
+SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5016992
+SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 5a32604c1c3bcb64919ed11db4b5cbb6cef5aea54d4e7f35fad445220f5dbfa6
+SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 48344072
+SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 8cdf9cf3be93494649d250a222dd4a8db6867a679f1c110dfe92bd9f2b761535
+SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 17106944
+SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 8665168eea8b04ee983de7ced7f7c6a3e88ec136561a0a8c89355ed3d55365dc
+SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 4969784
+SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 0df88d458b36bd5b7684b222ec555eb9a26db23f6355ec2034314f63a711c8de
+SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 46170144
+SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3728222329ca5175a2c58043893db99f6ae52a69ce79a8dd531d10a75cad01be
+SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17010544
+SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4ff53b2649df6d6f449ff4be81b5e6ccbf8a1ae6b0a6ce70767547ef7e2e45c7
+SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4710772
diff --git a/lang/rust/files/patch-library_stdarch_crates_std__detect_src_detect_os_freebsd_aarch64.rs b/lang/rust/files/patch-library_stdarch_crates_std__detect_src_detect_os_freebsd_aarch64.rs
deleted file mode 100644
index 4b62546b16b4..000000000000
--- a/lang/rust/files/patch-library_stdarch_crates_std__detect_src_detect_os_freebsd_aarch64.rs
+++ /dev/null
@@ -1,10 +0,0 @@
---- library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs.orig 2021-06-16 15:22:56 UTC
-+++ library/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
-@@ -1,6 +1,6 @@
- //! Run-time feature detection for Aarch64 on FreeBSD.
-
--pub use super::super::aarch64::detect_features;
-+pub(crate) use super::super::aarch64::detect_features;
-
- #[cfg(test)]
- mod tests {
diff --git a/lang/rust/files/patch-src_bootstrap_install.rs b/lang/rust/files/patch-src_bootstrap_install.rs
index 59e25e10468d..ff7244448846 100644
--- a/lang/rust/files/patch-src_bootstrap_install.rs
+++ b/lang/rust/files/patch-src_bootstrap_install.rs
@@ -6,12 +6,12 @@ docs first.
--- src/bootstrap/install.rs.orig 2021-03-22 17:05:25 UTC
+++ src/bootstrap/install.rs
-@@ -133,7 +133,7 @@ macro_rules! install {
+@@ -138,7 +138,7 @@ macro_rules! install {
}
install!((self, builder, _config),
- Docs, "src/doc", _config.docs, only_hosts: false, {
+ Docs, "src/doc", _config.docs, only_hosts: true, {
- let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs");
- install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
- };
+ if let Some(tarball) = builder.ensure(dist::Docs { host: self.target }) {
+ install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball);
+ } else {
diff --git a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
index 5300b3e9b294..d2944b186075 100644
--- a/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
+++ b/lang/rust/files/patch-vendor_openssl-sys_build_main.rs
@@ -1,19 +1,18 @@
---- vendor/openssl-sys/build/main.rs.orig 2020-11-16 06:27:50.000000000 -0800
-+++ vendor/openssl-sys/build/main.rs 2020-12-11 12:47:11.685331000 -0800
-@@ -221,6 +221,8 @@
- (3, 1, 0) => ('3', '1', '0'),
- (3, 1, _) => ('3', '1', 'x'),
- (3, 2, 0) => ('3', '2', '0'),
-+ (3, 2, _) => ('3', '2', 'x'),
+--- vendor/openssl-sys/build/main.rs.orig 2021-07-26 15:20:39 UTC
++++ vendor/openssl-sys/build/main.rs
+@@ -232,6 +232,7 @@ See rust-openssl README for more information:
+ (3, 2, _) => ('3', '2', 'x'),
+ (3, 3, 0) => ('3', '3', '0'),
+ (3, 3, 1) => ('3', '3', '1'),
+ (3, 3, _) => ('3', '3', 'x'),
_ => version_error(),
};
-@@ -261,7 +263,7 @@
+@@ -272,7 +273,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
--through 3.2.0, but a different version of OpenSSL was found. The build is now aborting
+-through 3.3.1, but a different version of OpenSSL was found. The build is now aborting
+through 3.3.x, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.