|
|
|
@ -1,17 +1,17 @@
|
|
|
|
|
From 9d4f7c7f5c00875892508e24fe86a1244f038b78 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 21a769a9d06dc811652d9c405be4f92a06807164 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
|
Date: Sun, 7 Jul 2024 15:00:34 +0200
|
|
|
|
|
Date: Fri, 9 Aug 2024 13:36:02 +0200
|
|
|
|
|
Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
build.rs | 588 +------------------------------------------------------
|
|
|
|
|
1 file changed, 5 insertions(+), 583 deletions(-)
|
|
|
|
|
build.rs | 589 +------------------------------------------------------
|
|
|
|
|
1 file changed, 5 insertions(+), 584 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
|
index 407bc25..497789c 100644
|
|
|
|
|
index 7d9a661..497789c 100644
|
|
|
|
|
--- a/build.rs
|
|
|
|
|
+++ b/build.rs
|
|
|
|
|
@@ -1,612 +1,34 @@
|
|
|
|
|
@@ -1,613 +1,34 @@
|
|
|
|
|
-use std::env;
|
|
|
|
|
-use std::fs;
|
|
|
|
|
-use std::path::{Path, PathBuf};
|
|
|
|
@ -114,7 +114,7 @@ index 407bc25..497789c 100644
|
|
|
|
|
- .replace("@LIBCURL_LIBS@", "")
|
|
|
|
|
- .replace("@SUPPORT_FEATURES@", "")
|
|
|
|
|
- .replace("@SUPPORT_PROTOCOLS@", "")
|
|
|
|
|
- .replace("@CURLVERSION@", "8.8.0"),
|
|
|
|
|
- .replace("@CURLVERSION@", "8.9.0"),
|
|
|
|
|
- )
|
|
|
|
|
- .unwrap();
|
|
|
|
|
-
|
|
|
|
@ -334,6 +334,7 @@ index 407bc25..497789c 100644
|
|
|
|
|
- .file("curl/lib/vtls/x509asn1.c");
|
|
|
|
|
- } else if target.contains("-apple-") {
|
|
|
|
|
- cfg.define("USE_SECTRANSP", None)
|
|
|
|
|
- .file("curl/lib/vtls/cipher_suite.c")
|
|
|
|
|
- .file("curl/lib/vtls/sectransp.c")
|
|
|
|
|
- .file("curl/lib/vtls/x509asn1.c");
|
|
|
|
|
- if xcode_major_version().map_or(true, |v| v >= 9) {
|
|
|
|
@ -630,5 +631,5 @@ index 407bc25..497789c 100644
|
|
|
|
|
- None
|
|
|
|
|
-}
|
|
|
|
|
--
|
|
|
|
|
2.45.2
|
|
|
|
|
2.46.0
|
|
|
|
|
|
|
|
|
|