diff options
Diffstat (limited to 'vendor/curl-sys/debian')
-rw-r--r-- | vendor/curl-sys/debian/patches/avoid-spurious-rebuilds.patch | 12 | ||||
-rw-r--r-- | vendor/curl-sys/debian/patches/disable-libz-sys.patch | 27 | ||||
-rw-r--r-- | vendor/curl-sys/debian/patches/disable-rustls.patch | 22 | ||||
-rw-r--r-- | vendor/curl-sys/debian/patches/disable-vendor.patch | 25 | ||||
-rw-r--r-- | vendor/curl-sys/debian/patches/drop-non-linux.patch | 22 | ||||
-rw-r--r-- | vendor/curl-sys/debian/patches/series | 5 |
6 files changed, 113 insertions, 0 deletions
diff --git a/vendor/curl-sys/debian/patches/avoid-spurious-rebuilds.patch b/vendor/curl-sys/debian/patches/avoid-spurious-rebuilds.patch new file mode 100644 index 0000000..37046e6 --- /dev/null +++ b/vendor/curl-sys/debian/patches/avoid-spurious-rebuilds.patch @@ -0,0 +1,12 @@ +Since we excluded the "curl" source code directory, this check is no longer +applicable and would always lead to rebuilds since the file is non-existent. +--- a/build.rs ++++ b/build.rs +@@ -4,7 +4,6 @@ + use std::process::Command; + + fn main() { +- println!("cargo:rerun-if-changed=curl"); + let target = env::var("TARGET").unwrap(); + let windows = target.contains("windows"); + diff --git a/vendor/curl-sys/debian/patches/disable-libz-sys.patch b/vendor/curl-sys/debian/patches/disable-libz-sys.patch new file mode 100644 index 0000000..b865d75 --- /dev/null +++ b/vendor/curl-sys/debian/patches/disable-libz-sys.patch @@ -0,0 +1,27 @@ +Description: for now, disable libz to avoid NEW trip + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -33,11 +33,6 @@ + version = "0.1.3" + optional = true + +-[dependencies.libz-sys] +-version = "1.0.18" +-features = ["libc"] +-default-features = false +- + [dependencies.rustls-ffi] + version = "0.8" + features = ["no_log_capture"] +@@ -64,10 +59,6 @@ + static-ssl = ["openssl-sys"] + upkeep_7_62_0 = [] + windows-static-ssl = [] +-zlib-ng-compat = [ +- "libz-sys/zlib-ng", +- "static-curl", +-] + + [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] + version = "0.9.64" diff --git a/vendor/curl-sys/debian/patches/disable-rustls.patch b/vendor/curl-sys/debian/patches/disable-rustls.patch new file mode 100644 index 0000000..7b8c51f --- /dev/null +++ b/vendor/curl-sys/debian/patches/disable-rustls.patch @@ -0,0 +1,22 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -33,11 +33,6 @@ + version = "0.1.3" + optional = true + +-[dependencies.rustls-ffi] +-version = "0.8" +-features = ["no_log_capture"] +-optional = true +- + [build-dependencies.cc] + version = "1.0" + +@@ -52,7 +47,6 @@ + ntlm = [] + poll_7_68_0 = [] + protocol-ftp = [] +-rustls = ["rustls-ffi"] + spnego = [] + ssl = ["openssl-sys"] + static-curl = [] diff --git a/vendor/curl-sys/debian/patches/disable-vendor.patch b/vendor/curl-sys/debian/patches/disable-vendor.patch new file mode 100644 index 0000000..8c37dda --- /dev/null +++ b/vendor/curl-sys/debian/patches/disable-vendor.patch @@ -0,0 +1,25 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -61,7 +61,7 @@ + spnego = [] + ssl = ["openssl-sys"] + static-curl = [] +-static-ssl = ["openssl-sys/vendored"] ++static-ssl = ["openssl-sys"] + upkeep_7_62_0 = [] + windows-static-ssl = [] + zlib-ng-compat = [ +--- a/build.rs ++++ b/build.rs +@@ -18,8 +18,9 @@ + return println!("cargo:rustc-flags=-l curl"); + } + +- // If the static-curl feature is disabled, probe for a system-wide libcurl. +- if !cfg!(feature = "static-curl") { ++ // On Debian, always probe for a system-wide libcurl even when linking statically ++ if true { ++ if cfg!(feature = "static-curl") { println!("cargo:static=1"); } + // OSX ships libcurl by default, so we just use that version + // so long as it has the right features enabled. + if target.contains("apple") && (!cfg!(feature = "http2") || curl_config_reports_http2()) { diff --git a/vendor/curl-sys/debian/patches/drop-non-linux.patch b/vendor/curl-sys/debian/patches/drop-non-linux.patch new file mode 100644 index 0000000..b0d2350 --- /dev/null +++ b/vendor/curl-sys/debian/patches/drop-non-linux.patch @@ -0,0 +1,22 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -52,19 +51,11 @@ + static-curl = [] + static-ssl = ["openssl-sys"] + upkeep_7_62_0 = [] +-windows-static-ssl = [] + + [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] + version = "0.9.64" + optional = true + +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = ["Win32_Networking_WinSock"] +- + [badges.appveyor] + repository = "alexcrichton/curl-rust" + diff --git a/vendor/curl-sys/debian/patches/series b/vendor/curl-sys/debian/patches/series new file mode 100644 index 0000000..3321281 --- /dev/null +++ b/vendor/curl-sys/debian/patches/series @@ -0,0 +1,5 @@ +avoid-spurious-rebuilds.patch +disable-vendor.patch +disable-libz-sys.patch +disable-rustls.patch +drop-non-linux.patch |