subprojects: add curl

This commit is contained in:
Max Kellermann
2023-12-11 10:02:35 +01:00
parent efa8304d2d
commit 578c94081f
9 changed files with 49 additions and 72 deletions

View File

@@ -1,13 +0,0 @@
Index: curl-7.85.0/CMakeLists.txt
===================================================================
--- curl-7.85.0.orig/CMakeLists.txt
+++ curl-7.85.0/CMakeLists.txt
@@ -1655,7 +1655,7 @@
set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
set(LIBCURL_LIBS "")
set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
- foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS})
+ foreach(_lib ${CURL_LIBS})
if(TARGET "${_lib}")
set(_libname "${_lib}")
get_target_property(_imported "${_libname}" IMPORTED)

View File

@@ -1,20 +0,0 @@
Index: curl-7.84.0/lib/url.c
===================================================================
--- curl-7.84.0.orig/lib/url.c
+++ curl-7.84.0/lib/url.c
@@ -3003,6 +3003,7 @@ static CURLcode override_login(struct Cu
#ifndef CURL_DISABLE_NETRC
conn->bits.netrc = FALSE;
+#ifndef __BIONIC__
if(data->set.use_netrc && !data->set.str[STRING_USERNAME]) {
bool netrc_user_changed = FALSE;
bool netrc_passwd_changed = FALSE;
@@ -3079,6 +3080,7 @@ static CURLcode override_login(struct Cu
return CURLE_OUT_OF_MEMORY;
}
}
+#endif
return CURLE_OK;
}

View File

@@ -1,2 +0,0 @@
no_CMAKE_C_IMPLICIT_LINK_LIBRARIES.patch
no_netrc.patch