|
|
|
|
@ -1,17 +1,17 @@
|
|
|
|
|
From 28cabd6e1bb96e88105f57df1c7126f68899261d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From e3d51c5adba339fe2f1f2434399db940a666034e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
|
Date: Tue, 28 Feb 2023 12:43:36 +0100
|
|
|
|
|
Date: Mon, 12 Jun 2023 14:10:33 +0200
|
|
|
|
|
Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
build.rs | 587 +------------------------------------------------------
|
|
|
|
|
1 file changed, 5 insertions(+), 582 deletions(-)
|
|
|
|
|
build.rs | 582 +------------------------------------------------------
|
|
|
|
|
1 file changed, 5 insertions(+), 577 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
|
index e09ae14..0df5044 100644
|
|
|
|
|
index aae0ac6..497789c 100644
|
|
|
|
|
--- a/build.rs
|
|
|
|
|
+++ b/build.rs
|
|
|
|
|
@@ -1,610 +1,33 @@
|
|
|
|
|
@@ -1,606 +1,34 @@
|
|
|
|
|
-use std::env;
|
|
|
|
|
-use std::fs;
|
|
|
|
|
-use std::path::{Path, PathBuf};
|
|
|
|
|
@ -19,7 +19,6 @@ index e09ae14..0df5044 100644
|
|
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
|
- println!("cargo:rerun-if-changed=curl");
|
|
|
|
|
- let host = env::var("HOST").unwrap();
|
|
|
|
|
- let target = env::var("TARGET").unwrap();
|
|
|
|
|
- let windows = target.contains("windows");
|
|
|
|
|
-
|
|
|
|
|
@ -34,13 +33,6 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- return println!("cargo:rustc-flags=-l curl");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // When cross-compiling for Haiku, use the system's default supplied
|
|
|
|
|
- // libcurl (it supports http2). This is in the case where rustc and
|
|
|
|
|
- // cargo are built for Haiku, which is done from a Linux host.
|
|
|
|
|
- if host != target && target.contains("haiku") {
|
|
|
|
|
- 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") {
|
|
|
|
|
- // OSX ships libcurl by default, so we just use that version
|
|
|
|
|
@ -122,7 +114,7 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- .replace("@LIBCURL_LIBS@", "")
|
|
|
|
|
- .replace("@SUPPORT_FEATURES@", "")
|
|
|
|
|
- .replace("@SUPPORT_PROTOCOLS@", "")
|
|
|
|
|
- .replace("@CURLVERSION@", "7.88.1"),
|
|
|
|
|
- .replace("@CURLVERSION@", "8.1.2"),
|
|
|
|
|
- )
|
|
|
|
|
- .unwrap();
|
|
|
|
|
-
|
|
|
|
|
@ -154,9 +146,12 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- .file("curl/lib/asyn-thread.c")
|
|
|
|
|
- .file("curl/lib/altsvc.c")
|
|
|
|
|
- .file("curl/lib/base64.c")
|
|
|
|
|
- .file("curl/lib/bufq.c")
|
|
|
|
|
- .file("curl/lib/bufref.c")
|
|
|
|
|
- .file("curl/lib/cfilters.c")
|
|
|
|
|
- .file("curl/lib/cf-http.c")
|
|
|
|
|
- .file("curl/lib/cf-h1-proxy.c")
|
|
|
|
|
- .file("curl/lib/cf-haproxy.c")
|
|
|
|
|
- .file("curl/lib/cf-https-connect.c")
|
|
|
|
|
- .file("curl/lib/cf-socket.c")
|
|
|
|
|
- .file("curl/lib/conncache.c")
|
|
|
|
|
- .file("curl/lib/connect.c")
|
|
|
|
|
@ -170,6 +165,7 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- .file("curl/lib/curl_threads.c")
|
|
|
|
|
- .file("curl/lib/doh.c")
|
|
|
|
|
- .file("curl/lib/dynbuf.c")
|
|
|
|
|
- .file("curl/lib/dynhds.c")
|
|
|
|
|
- .file("curl/lib/easy.c")
|
|
|
|
|
- .file("curl/lib/escape.c")
|
|
|
|
|
- .file("curl/lib/file.c")
|
|
|
|
|
@ -186,6 +182,7 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- .file("curl/lib/hostip6.c")
|
|
|
|
|
- .file("curl/lib/hsts.c")
|
|
|
|
|
- .file("curl/lib/http.c")
|
|
|
|
|
- .file("curl/lib/http1.c")
|
|
|
|
|
- .file("curl/lib/http_aws_sigv4.c")
|
|
|
|
|
- .file("curl/lib/http_chunks.c")
|
|
|
|
|
- .file("curl/lib/http_digest.c")
|
|
|
|
|
@ -237,7 +234,6 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- .file("curl/lib/vtls/keylog.c")
|
|
|
|
|
- .file("curl/lib/vtls/vtls.c")
|
|
|
|
|
- .file("curl/lib/warnless.c")
|
|
|
|
|
- .file("curl/lib/wildcard.c")
|
|
|
|
|
- .file("curl/lib/timediff.c")
|
|
|
|
|
- .define("HAVE_GETADDRINFO", None)
|
|
|
|
|
- .define("HAVE_GETPEERNAME", None)
|
|
|
|
|
@ -270,7 +266,7 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- if cfg!(feature = "http2") {
|
|
|
|
|
- cfg.define("USE_NGHTTP2", None)
|
|
|
|
|
- .define("NGHTTP2_STATICLIB", None)
|
|
|
|
|
- .file("curl/lib/h2h3.c")
|
|
|
|
|
- .file("curl/lib/cf-h2-proxy.c")
|
|
|
|
|
- .file("curl/lib/http2.c");
|
|
|
|
|
-
|
|
|
|
|
- println!("cargo:rustc-cfg=link_libnghttp2");
|
|
|
|
|
@ -596,7 +592,7 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- );
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
@ -628,5 +624,5 @@ index e09ae14..0df5044 100644
|
|
|
|
|
- None
|
|
|
|
|
-}
|
|
|
|
|
--
|
|
|
|
|
2.39.2
|
|
|
|
|
2.41.0
|
|
|
|
|
|
|
|
|
|
|
Fabio Valentini
2 years ago