Page MenuHomeFreeBSD
Differential D18610 Diff 52215 head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs

Changeset View

Standalone View

View Options

head/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs

https://github.com/sfackler/rust-openssl/commit/9fd7584a8416 https://github.com/sfackler/rust-openssl/commit/9fd7584a8416
https://github.com/sfackler/rust-openssl/commit/e75793e8962d
--- src/vendor/openssl-sys/build/main.rs.orig 2018-12-03 20:08:24 UTC --- src/vendor/openssl-sys/build/main.rs.orig 2018-12-05 01:24:32 UTC
+++ src/vendor/openssl-sys/build/main.rs +++ src/vendor/openssl-sys/build/main.rs
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
extern crate cc; extern crate cc;
+#[cfg(feature = "vendored")] +#[cfg(feature = "vendored")]
+extern crate openssl_src; +extern crate openssl_src;
extern crate pkg_config; extern crate pkg_config;
#[cfg(target_env = "msvc")] #[cfg(target_env = "msvc")]
extern crate vcpkg; extern crate vcpkg;
Show All 28 Lines
mod imp { mod imp {
use pkg_config; use pkg_config;
- use std::path::{Path, PathBuf}; - use std::path::{Path, PathBuf};
use std::ffi::OsString; use std::ffi::OsString;
+ use std::path::{Path, PathBuf}; + use std::path::{Path, PathBuf};
use std::process::{self, Command}; use std::process::{self, Command};
use super::env; use super::env;
@@ -500,6 +503,7 @@ See rust-openssl README for more information: @@ -500,6 +503,8 @@ See rust-openssl README for more information:
(7, _) => ('7', 'x'), (7, _) => ('7', 'x'),
(8, 0) => ('8', '0'), (8, 0) => ('8', '0'),
(8, 1) => ('8', '1'), (8, 1) => ('8', '1'),
+ (8, _) => ('8', 'x'), + (8, _) => ('8', 'x'),
+ (9, 0) => ('9', '0'),
_ => version_error(), _ => version_error(),
}; };
@@ -540,7 +545,7 @@ fn version_error() -> ! {
"
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
-through 2.8.1, but a different version of OpenSSL was found. The build is now aborting
+through 2.9.0, but a different version of OpenSSL was found. The build is now aborting
due to this version mismatch.
"