-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Use static libcurl build with conan (#4445)"
This reverts commit ea06356.
- Loading branch information
1 parent
f996e9d
commit 0a9f16f
Showing
49 changed files
with
5,710 additions
and
373 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-10.4 MB
ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcrypto.a
Binary file not shown.
Binary file removed
BIN
-1.48 MB
ktor-client/ktor-client-curl/desktop/interop/lib/linuxArm64/libcurl.a
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-10.6 MB
ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcrypto.a
Binary file not shown.
Binary file removed
BIN
-1.49 MB
ktor-client/ktor-client-curl/desktop/interop/lib/linuxX64/libcurl.a
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-1.05 MB
ktor-client/ktor-client-curl/desktop/interop/lib/macosArm64/libcurl.a
Binary file not shown.
Binary file removed
BIN
-1020 KB
ktor-client/ktor-client-curl/desktop/interop/lib/macosX64/libcurl.a
Binary file not shown.
Binary file removed
BIN
-8.12 MB
ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcrypto.a
Binary file not shown.
Binary file removed
BIN
-1.11 MB
ktor-client/ktor-client-curl/desktop/interop/lib/mingwX64/libcurl.a
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,56 @@ | ||
# curl version = 8.10.1 | ||
package = libcurl | ||
headers = curl/curl.h | ||
headerFilter = curl/* | ||
compilerOpts.mingw_x64 = -DCURL_STATICLIB | ||
|
||
# there is no libz by default installed on windows, so we need to include it statically | ||
staticLibraries.mingw = libcurl.a libssl.a libcrypto.a libz.a | ||
compilerOpts.mingw = -DCURL_STATICLIB | ||
linkerOpts.osx = -lcurl \ | ||
-L/usr/lib64 \ | ||
-L/usr/lib/x86_64-linux-gnu \ | ||
-L/opt/local/lib \ | ||
-L/usr/local/opt/curl/lib \ | ||
-L/opt/homebrew/opt/curl/lib | ||
|
||
# there is no need to use openssl on macos, as curl is built using out-of-the-box security framework | ||
staticLibraries.osx = libcurl.a | ||
linkerOpts.osx = -framework Security -framework SystemConfiguration | ||
compilerOpts.osx = -I/opt/local/include/ \ | ||
-I/usr/bin/ \ | ||
-I/usr/local/include/ \ | ||
-I/usr/include/ \ | ||
-I/usr/local/Cellar/curl/7.83.1/include/ \ | ||
-I/usr/local/Cellar/curl/7.81.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.80.0_1/include/ \ | ||
-I/usr/local/Cellar/curl/7.80.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.62.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.63.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.65.3/include/ \ | ||
-I/usr/local/Cellar/curl/7.66.0/include/ \ | ||
-I/opt/homebrew/opt/curl/include/ | ||
|
||
staticLibraries.linux = libcurl.a libssl.a libcrypto.a | ||
linkerOpts.linux = -lz | ||
linkerOpts.linux = -lcurl \ | ||
-L/usr/lib64 \ | ||
-L/usr/lib/x86_64-linux-gnu \ | ||
-L/opt/local/lib \ | ||
-L/usr/local/opt/curl/lib \ | ||
-L/opt/homebrew/opt/curl/lib | ||
|
||
compilerOpts.linux = -I/usr/include/ \ | ||
-I/usr/include/x86_64-linux-gnu/ \ | ||
-I/opt/homebrew/opt/curl/include/ | ||
|
||
staticLibraries.mingw_x64 = \ | ||
libcurl.a \ | ||
libssh2.a \ | ||
libidn2.a \ | ||
libpsl.a \ | ||
libbrotlidec.a \ | ||
libbrotlicommon.a \ | ||
libunistring.a \ | ||
libzstd.a \ | ||
|
||
libraryPaths = desktop/interop/mingwX64/lib | ||
|
||
linkerOpts.mingw_x64 = -Wl,-Bstatic -lstdc++ -static \ | ||
-lbcrypt \ | ||
-lcrypt32 \ | ||
-liconv \ | ||
-lwldap32 \ | ||
-lws2_32 \ | ||
-lz |
24 changes: 24 additions & 0 deletions
24
ktor-client/ktor-client-curl/desktop/interop/libcurl_arm64.def
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package = libcurl | ||
headers = curl/curl.h | ||
headerFilter = curl/* | ||
|
||
linkerOpts.osx = -lcurl \ | ||
-L/usr/lib64 \ | ||
-L/usr/lib/x86_64-linux-gnu \ | ||
-L/opt/local/lib \ | ||
-L/usr/local/lib \ | ||
-L/opt/homebrew/opt/curl/lib \ | ||
-L/usr/local/opt/curl/lib | ||
|
||
compilerOpts.osx = -I/opt/homebrew/opt/curl/include/ \ | ||
-I/usr/bin/ \ | ||
-I/usr/local/include/ \ | ||
-I/usr/include/ \ | ||
-I/usr/local/Cellar/curl/7.83.1/include/ \ | ||
-I/usr/local/Cellar/curl/7.81.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.80.0_1/include/ \ | ||
-I/usr/local/Cellar/curl/7.80.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.62.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.63.0/include/ \ | ||
-I/usr/local/Cellar/curl/7.65.3/include/ \ | ||
-I/usr/local/Cellar/curl/7.66.0/include/ |
7 changes: 7 additions & 0 deletions
7
ktor-client/ktor-client-curl/desktop/interop/libcurl_linux_arm64.def
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package = libcurl | ||
headers = curl/curl.h | ||
headerFilter = curl/* | ||
|
||
staticLibraries = libcurl.a | ||
|
||
libraryPaths = desktop/interop/linuxArm64/lib |
Oops, something went wrong.