aboutsummaryrefslogtreecommitdiff
path: root/extra/rust/patches
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2020-02-03 01:45:53 +0300
committerCem Keylan <cem@ckyln.com>2020-02-03 01:45:53 +0300
commit988394be37e087fc0ab852cbcf745eb3bc225def (patch)
treeb72f1095fbbc08c053ff5ca3f534437a798a9460 /extra/rust/patches
parenta2ef0fde3a13536a2b697ff3e830287d3ad5f914 (diff)
downloadrepository-988394be37e087fc0ab852cbcf745eb3bc225def.tar.gz
rust: bump to 1.41.0
Diffstat (limited to 'extra/rust/patches')
-rw-r--r--extra/rust/patches/musl.patch (renamed from extra/rust/patches/musl-libressl.patch)50
1 files changed, 0 insertions, 50 deletions
diff --git a/extra/rust/patches/musl-libressl.patch b/extra/rust/patches/musl.patch
index 33402597..6cb1c83e 100644
--- a/extra/rust/patches/musl-libressl.patch
+++ b/extra/rust/patches/musl.patch
@@ -76,53 +76,3 @@ index 721d24116..26bf271cd 100644
#[cfg_attr(feature = "rustc-dep-of-std",
link(name = "c", kind = "static",
cfg(target_feature = "crt-static")))]
-diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs
-index 02b93b90a..27deca5fe 100644
---- a/vendor/openssl-sys/build/main.rs
-+++ b/vendor/openssl-sys/build/main.rs
-@@ -183,27 +183,30 @@ See rust-openssl README for more information:
- if let Some(libressl_version) = libressl_version {
- println!("cargo:libressl_version_number={:x}", libressl_version);
-
-+ let major = (libressl_version >> 28) as u8;
- let minor = (libressl_version >> 20) as u8;
- let fix = (libressl_version >> 12) as u8;
-- let (minor, fix) = match (minor, fix) {
-- (5, 0) => ('5', '0'),
-- (5, 1) => ('5', '1'),
-- (5, 2) => ('5', '2'),
-- (5, _) => ('5', 'x'),
-- (6, 0) => ('6', '0'),
-- (6, 1) => ('6', '1'),
-- (6, 2) => ('6', '2'),
-- (6, _) => ('6', 'x'),
-- (7, _) => ('7', 'x'),
-- (8, 0) => ('8', '0'),
-- (8, 1) => ('8', '1'),
-- (8, _) => ('8', 'x'),
-- (9, 0) => ('9', '0'),
-+ let (major, minor, fix) = match (major, minor, fix) {
-+ (2, 5, 0) => ('2', '5', '0'),
-+ (2, 5, 1) => ('2', '5', '1'),
-+ (2, 5, 2) => ('2', '5', '2'),
-+ (2, 5, _) => ('2', '5', 'x'),
-+ (2, 6, 0) => ('2', '6', '0'),
-+ (2, 6, 1) => ('2', '6', '1'),
-+ (2, 6, 2) => ('2', '6', '2'),
-+ (2, 6, _) => ('2', '6', 'x'),
-+ (2, 7, _) => ('2', '7', 'x'),
-+ (2, 8, 0) => ('2', '8', '0'),
-+ (2, 8, 1) => ('2', '8', '1'),
-+ (3, 0, _) => ('3', '0', 'x'),
-+ (2, 9, 0) => ('2', '9', '0'),
-+ (2, 9, _) => ('2', '9', 'x'),
-+ (3, 0, 0) => ('3', '0', '0'),
- _ => version_error(),
- };
-
- println!("cargo:libressl=true");
-- println!("cargo:libressl_version=2{}{}", minor, fix);
-+ println!("cargo:libressl_version={}{}{}", major, minor, fix);
- println!("cargo:version=101");
- Version::Libressl
- } else {