From ac182aed8551d7c57ee359663506e5c3e3afed82 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 14 Oct 2020 10:51:48 -0700 Subject: [PATCH] Bump curl submodule to 7.73.0 --- curl-sys/Cargo.toml | 2 +- curl-sys/build.rs | 47 +++++++++++++++++++++------------------------ curl-sys/curl | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/curl-sys/Cargo.toml b/curl-sys/Cargo.toml index 8b961323b1..506e258a4f 100644 --- a/curl-sys/Cargo.toml +++ b/curl-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "curl-sys" -version = "0.4.37+curl-7.72.0" +version = "0.4.38+curl-7.73.0" authors = ["Alex Crichton "] links = "curl" build = "build.rs" diff --git a/curl-sys/build.rs b/curl-sys/build.rs index ae74528ec9..4f04b90e83 100644 --- a/curl-sys/build.rs +++ b/curl-sys/build.rs @@ -63,31 +63,27 @@ fn main() { println!("cargo:include={}", include.display()); println!("cargo:static=1"); fs::create_dir_all(include.join("curl")).unwrap(); - fs::copy("curl/include/curl/curl.h", include.join("curl/curl.h")).unwrap(); - fs::copy( - "curl/include/curl/curlver.h", - include.join("curl/curlver.h"), - ) - .unwrap(); - fs::copy("curl/include/curl/easy.h", include.join("curl/easy.h")).unwrap(); - fs::copy( - "curl/include/curl/mprintf.h", - include.join("curl/mprintf.h"), - ) - .unwrap(); - fs::copy("curl/include/curl/multi.h", include.join("curl/multi.h")).unwrap(); - fs::copy( - "curl/include/curl/stdcheaders.h", - include.join("curl/stdcheaders.h"), - ) - .unwrap(); - fs::copy("curl/include/curl/system.h", include.join("curl/system.h")).unwrap(); - fs::copy("curl/include/curl/urlapi.h", include.join("curl/urlapi.h")).unwrap(); - fs::copy( - "curl/include/curl/typecheck-gcc.h", - include.join("curl/typecheck-gcc.h"), - ) - .unwrap(); + + for header in [ + "curl.h", + "curlver.h", + "easy.h", + "options.h", + "mprintf.h", + "multi.h", + "stdcheaders.h", + "system.h", + "urlapi.h", + "typecheck-gcc.h", + ] + .iter() + { + fs::copy( + format!("curl/include/curl/{}", header), + include.join("curl").join(header), + ) + .unwrap(); + } let pkgconfig = dst.join("lib/pkgconfig"); fs::create_dir_all(&pkgconfig).unwrap(); @@ -168,6 +164,7 @@ fn main() { .file("curl/lib/llist.c") .file("curl/lib/mime.c") .file("curl/lib/mprintf.c") + .file("curl/lib/mqtt.c") .file("curl/lib/multi.c") .file("curl/lib/netrc.c") .file("curl/lib/nonblock.c") diff --git a/curl-sys/curl b/curl-sys/curl index 9d954e49bc..315ee3fe75 160000 --- a/curl-sys/curl +++ b/curl-sys/curl @@ -1 +1 @@ -Subproject commit 9d954e49bce3706a9a2efb119ecd05767f0f2a9e +Subproject commit 315ee3fe75dade912b48a21ceec9ccda0230d937