diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:55 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:47:55 +0000 |
commit | 2aadc03ef15cb5ca5cc2af8a7c08e070742f0ac4 (patch) | |
tree | 033cc839730fda84ff08db877037977be94e5e3a /vendor/openssl-sys/debian/patches/disable-vendor.patch | |
parent | Initial commit. (diff) | |
download | cargo-2aadc03ef15cb5ca5cc2af8a7c08e070742f0ac4.tar.xz cargo-2aadc03ef15cb5ca5cc2af8a7c08e070742f0ac4.zip |
Adding upstream version 0.70.1+ds1.upstream/0.70.1+ds1upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/openssl-sys/debian/patches/disable-vendor.patch')
-rw-r--r-- | vendor/openssl-sys/debian/patches/disable-vendor.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/vendor/openssl-sys/debian/patches/disable-vendor.patch b/vendor/openssl-sys/debian/patches/disable-vendor.patch new file mode 100644 index 0000000..aa033cb --- /dev/null +++ b/vendor/openssl-sys/debian/patches/disable-vendor.patch @@ -0,0 +1,30 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -50,5 +50,0 @@ +-[build-dependencies.openssl-src] +-version = "300.1.2" +-features = ["legacy"] +-optional = true +- +@@ -60,1 +60,0 @@ +-vendored = ["openssl-src"] +--- a/build/main.rs ++++ b/build/main.rs +@@ -20,2 +20,0 @@ +-#[cfg(feature = "vendored")] +-mod find_vendored; +@@ -49,14 +47,6 @@ + } + + fn find_openssl(target: &str) -> (Vec<PathBuf>, PathBuf) { +- #[cfg(feature = "vendored")] +- { +- // vendor if the feature is present, unless +- // OPENSSL_NO_VENDOR exists and isn't `0` +- if env("OPENSSL_NO_VENDOR").map_or(true, |s| s == "0") { +- return find_vendored::get_openssl(target); +- } +- } + find_normal::get_openssl(target) + } + |