Skip to content

Commit

Permalink
[workspace] Upgrade curl_internal to latest release curl-8_3_0 (Robot…
Browse files Browse the repository at this point in the history
…Locomotion#20302)

Co-Authored-By: Jeremy Nimmer <[email protected]>
  • Loading branch information
2 people authored and WawasCode committed Oct 31, 2023
1 parent 9dbda2b commit 581414d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
17 changes: 10 additions & 7 deletions tools/workspace/curl_internal/cmakedefines.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,31 @@ _LINUX_CMAKE_DEFINES = [
"HAVE_GETHOSTBYNAME_R",
"HAVE_GETHOSTBYNAME_R_6",
"HAVE_MSG_NOSIGNAL",
"HAVE_RAND_EGD",
"HAVE_TERMIOS_H",
]

# These are the settings we want to enable for Drake. A few of them towards the
# bottom are conditional for Apple vs Linux. Keep this list alpha-sorted.
CMAKE_DEFINES = [
"CURL_DISABLE_ALTSVC",
"CURL_DISABLE_AWS",
"CURL_DISABLE_BASIC_AUTH",
"CURL_DISABLE_BEARER_AUTH",
"CURL_DISABLE_COOKIES",
"CURL_DISABLE_CRYPTO_AUTH",
"CURL_DISABLE_DICT",
"CURL_DISABLE_DIGEST_AUTH",
"CURL_DISABLE_DOH",
"CURL_DISABLE_FILE",
"CURL_DISABLE_FORM_API",
"CURL_DISABLE_FTP",
"CURL_DISABLE_GOPHER",
"CURL_DISABLE_HSTS",
"CURL_DISABLE_IMAP",
"CURL_DISABLE_KERBEROS_AUTH",
"CURL_DISABLE_LDAP",
"CURL_DISABLE_LDAPS",
"CURL_DISABLE_MQTT",
"CURL_DISABLE_NEGOTIATE_AUTH",
"CURL_DISABLE_NETRC",
"CURL_DISABLE_NTLM",
"CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG",
Expand All @@ -68,7 +73,6 @@ CMAKE_DEFINES = [
"CURL_DISABLE_SMTP",
"CURL_DISABLE_TELNET",
"CURL_DISABLE_TFTP",
"CURL_STATICLIB",
"ENABLE_IPV6",
"HAVE_ALARM",
"HAVE_ARPA_INET_H",
Expand Down Expand Up @@ -168,6 +172,7 @@ CMAKE_DEFINES = [
# Refer to CPP_DEFINES (above) for an explanation.
"SIZEOF_INT_CODE=",
"SIZEOF_LONG_CODE=",
"SIZEOF_LONG_LONG_CODE=",
"SIZEOF_OFF_T_CODE=",
"SIZEOF_CURL_OFF_T_CODE=",
"SIZEOF_SIZE_T_CODE=",
Expand All @@ -184,14 +189,14 @@ CMAKE_UNDEFINES = [
"CURL_CA_BUNDLE",
"CURL_CA_FALLBACK",
"CURL_CA_PATH",
"CURL_DEFAULT_SSL_BACKEND",
"CURL_DISABLE_HTTP",
"CURL_DISABLE_LIBCURL_OPTION",
"CURL_DISABLE_MIME",
"CURL_DISABLE_SOCKETPAIR",
"CURL_DISABLE_VERBOSE_STRINGS",
"CURL_EXTERN_SYMBOL",
"CURL_WITH_MULTI_SSL",
"EGD_SOCKET",
"HAVE_ADDRESS_FAMILY",
"HAVE_BROTLI",
"HAVE_BUILTIN_AVAILABLE",
Expand Down Expand Up @@ -226,12 +231,11 @@ CMAKE_UNDEFINES = [
"HAVE_LINUX_TCP_H",
"HAVE_MACH_ABSOLUTE_TIME",
"HAVE_OLD_GSSMIT",
"HAVE_PK11_CREATEMANAGEDGENERICOBJECT",
"HAVE_PTHREAD_H",
"HAVE_QUICHE_CONN_SET_QLOG_FD",
"HAVE_SA_FAMILY_T",
"HAVE_SETSOCKOPT_SO_NONBLOCK",
"HAVE_SSL_H",
"HAVE_SSL_SET0_WBIO",
"HAVE_STRCMPI",
"HAVE_STRICMP",
"HAVE_STROPTS_H",
Expand Down Expand Up @@ -264,7 +268,6 @@ CMAKE_UNDEFINES = [
"USE_NGHTTP2",
"USE_NGHTTP3",
"USE_NGTCP2",
"USE_NSS",
"USE_OPENLDAP",
"USE_OPENSSL",
"USE_QUICHE",
Expand Down
3 changes: 2 additions & 1 deletion tools/workspace/curl_internal/package.BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ _SRCS = [
"lib/cookie.c",
"lib/curl_addrinfo.c",
"lib/curl_get_line.c",
"lib/curl_log.c",
"lib/curl_memrchr.c",
"lib/curl_trc.c",
"lib/doh.c",
"lib/dynbuf.c",
"lib/dynhds.c",
Expand Down Expand Up @@ -128,6 +128,7 @@ _SRCS = [

# The build flags for the library only (not passed on to downstream code).
_COPTS = [
"-w",
# Our build of curl should be private.
"-fvisibility=hidden",
# To match CMakeLists.txt.
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/curl_internal/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def curl_internal_repository(
In case of a cmake_configure_file build error when upgrading curl,
update cmakedefines.bzl to match the new upstream definitions.
""",
commit = "curl-8_2_1",
sha256 = "230d61a4b1eb3346930f2d601cc8fe5237957163e16befbe15e0ef40c56767a2", # noqa
commit = "curl-8_3_0",
sha256 = "8a56cf0cd80788ecd7f3914a55a35f772d2d3956961c75c6a15419901c452409", # noqa
build_file = ":package.BUILD.bazel",
mirrors = mirrors,
)

0 comments on commit 581414d

Please sign in to comment.