|
|
@ -1,17 +1,17 @@
|
|
|
|
From e3d51c5adba339fe2f1f2434399db940a666034e Mon Sep 17 00:00:00 2001
|
|
|
|
From 09efbb01afdad57593abde233df70701ccfff180 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
Date: Mon, 12 Jun 2023 14:10:33 +0200
|
|
|
|
Date: Sat, 29 Jul 2023 16:34:22 +0200
|
|
|
|
Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
|
|
|
|
Subject: [PATCH] unconditionally use pkg-config to link with system libcurl
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
build.rs | 582 +------------------------------------------------------
|
|
|
|
build.rs | 583 +------------------------------------------------------
|
|
|
|
1 file changed, 5 insertions(+), 577 deletions(-)
|
|
|
|
1 file changed, 5 insertions(+), 578 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
index aae0ac6..497789c 100644
|
|
|
|
index 67c2772..497789c 100644
|
|
|
|
--- a/build.rs
|
|
|
|
--- a/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
@@ -1,606 +1,34 @@
|
|
|
|
@@ -1,607 +1,34 @@
|
|
|
|
-use std::env;
|
|
|
|
-use std::env;
|
|
|
|
-use std::fs;
|
|
|
|
-use std::fs;
|
|
|
|
-use std::path::{Path, PathBuf};
|
|
|
|
-use std::path::{Path, PathBuf};
|
|
|
@ -53,7 +53,7 @@ index aae0ac6..497789c 100644
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- if !Path::new("curl/.git").exists() {
|
|
|
|
- if !Path::new("curl/.git").exists() {
|
|
|
|
- let _ = Command::new("git")
|
|
|
|
- let _ = Command::new("git")
|
|
|
|
- .args(&["submodule", "update", "--init"])
|
|
|
|
- .args(&["submodule", "update", "--init", "curl"])
|
|
|
|
- .status();
|
|
|
|
- .status();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
@ -114,7 +114,7 @@ index aae0ac6..497789c 100644
|
|
|
|
- .replace("@LIBCURL_LIBS@", "")
|
|
|
|
- .replace("@LIBCURL_LIBS@", "")
|
|
|
|
- .replace("@SUPPORT_FEATURES@", "")
|
|
|
|
- .replace("@SUPPORT_FEATURES@", "")
|
|
|
|
- .replace("@SUPPORT_PROTOCOLS@", "")
|
|
|
|
- .replace("@SUPPORT_PROTOCOLS@", "")
|
|
|
|
- .replace("@CURLVERSION@", "8.1.2"),
|
|
|
|
- .replace("@CURLVERSION@", "8.2.1"),
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
- .unwrap();
|
|
|
|
- .unwrap();
|
|
|
|
-
|
|
|
|
-
|
|
|
@ -194,6 +194,7 @@ index aae0ac6..497789c 100644
|
|
|
|
- .file("curl/lib/llist.c")
|
|
|
|
- .file("curl/lib/llist.c")
|
|
|
|
- .file("curl/lib/md5.c")
|
|
|
|
- .file("curl/lib/md5.c")
|
|
|
|
- .file("curl/lib/mime.c")
|
|
|
|
- .file("curl/lib/mime.c")
|
|
|
|
|
|
|
|
- .file("curl/lib/macos.c")
|
|
|
|
- .file("curl/lib/mprintf.c")
|
|
|
|
- .file("curl/lib/mprintf.c")
|
|
|
|
- .file("curl/lib/mqtt.c")
|
|
|
|
- .file("curl/lib/mqtt.c")
|
|
|
|
- .file("curl/lib/multi.c")
|
|
|
|
- .file("curl/lib/multi.c")
|
|
|
|