diff options
| author | mikhnenko <mikhnenko@yandex-team.com> | 2024-09-12 19:30:48 +0300 |
|---|---|---|
| committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-09-12 19:50:35 +0300 |
| commit | 199514a288190e307760cad99a22f33bea95534c (patch) | |
| tree | 328381587679a2c7661a1835304a5bbf34af37fb | |
| parent | 20a8c1bdb3377f5cb86adc3173d7a329245ebaa1 (diff) | |
| download | ydb-199514a288190e307760cad99a22f33bea95534c.tar.gz | |
Add brotli to curl
commit_hash:639a9c72f0dabfbbec853df361875b3726ac4b2b
| -rw-r--r-- | contrib/libs/curl/lib/content_encoding.c | 2 | ||||
| -rw-r--r-- | contrib/libs/curl/lib/curl_config-linux.h | 6 | ||||
| -rw-r--r-- | contrib/libs/curl/lib/curl_config-osx.h | 6 | ||||
| -rw-r--r-- | contrib/libs/curl/lib/curl_config-win.h | 2 | ||||
| -rw-r--r-- | contrib/libs/curl/lib/version.c | 2 | ||||
| -rw-r--r-- | contrib/libs/curl/ya.make | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/contrib/libs/curl/lib/content_encoding.c b/contrib/libs/curl/lib/content_encoding.c index 8534718b5f..4167d4d684 100644 --- a/contrib/libs/curl/lib/content_encoding.c +++ b/contrib/libs/curl/lib/content_encoding.c @@ -38,7 +38,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" #endif -#error #include <brotli/decode.h> +#include <brotli/decode.h> #if defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/contrib/libs/curl/lib/curl_config-linux.h b/contrib/libs/curl/lib/curl_config-linux.h index 57ecc30b9b..22debd1fcd 100644 --- a/contrib/libs/curl/lib/curl_config-linux.h +++ b/contrib/libs/curl/lib/curl_config-linux.h @@ -176,10 +176,10 @@ #define HAVE_BOOL_T 1 /* if BROTLI is in use */ -/* #undef HAVE_BROTLI */ +#define HAVE_BROTLI 1 /* Define to 1 if you have the <brotli/decode.h> header file. */ -/* #undef HAVE_BROTLI_DECODE_H */ +#define HAVE_BROTLI_DECODE_H 1 /* Define to 1 if you have the __builtin_available function. */ /* #undef HAVE_BUILTIN_AVAILABLE */ @@ -395,7 +395,7 @@ /* #undef HAVE_LDAP_URL_PARSE */ /* Define to 1 if you have the `brotlidec' library (-lbrotlidec). */ -/* #undef HAVE_LIBBROTLIDEC */ +#define HAVE_LIBBROTLIDEC 1 /* Define to 1 if you have the <libgen.h> header file. */ #define HAVE_LIBGEN_H 1 diff --git a/contrib/libs/curl/lib/curl_config-osx.h b/contrib/libs/curl/lib/curl_config-osx.h index b6694c6704..f6b6041caf 100644 --- a/contrib/libs/curl/lib/curl_config-osx.h +++ b/contrib/libs/curl/lib/curl_config-osx.h @@ -149,10 +149,10 @@ /* #undef HAVE_BORINGSSL */ /* if BROTLI is in use */ -/* #undef HAVE_BROTLI */ +#define HAVE_BROTLI 1 /* Define to 1 if you have the <brotli/decode.h> header file. */ -/* #undef HAVE_BROTLI_DECODE_H */ +#define HAVE_BROTLI_DECODE_H 1 /* Define to 1 if you have the __builtin_available function. */ #define HAVE_BUILTIN_AVAILABLE 1 @@ -407,7 +407,7 @@ /* #undef HAVE_LDAP_URL_PARSE */ /* Define to 1 if you have the `brotlidec' library (-lbrotlidec). */ -/* #undef HAVE_LIBBROTLIDEC */ +#define HAVE_LIBBROTLIDEC 1 /* Define to 1 if you have the <libgen.h> header file. */ #define HAVE_LIBGEN_H 1 diff --git a/contrib/libs/curl/lib/curl_config-win.h b/contrib/libs/curl/lib/curl_config-win.h index 24d2561fba..89b070743b 100644 --- a/contrib/libs/curl/lib/curl_config-win.h +++ b/contrib/libs/curl/lib/curl_config-win.h @@ -435,7 +435,7 @@ #define HAVE_LIBZ 1 /* if brotli is available */ -/* #undef HAVE_BROTLI */ +#define HAVE_BROTLI 1 /* if your compiler supports LL */ #define HAVE_LL 1 diff --git a/contrib/libs/curl/lib/version.c b/contrib/libs/curl/lib/version.c index d419dd49da..0aca34a4cd 100644 --- a/contrib/libs/curl/lib/version.c +++ b/contrib/libs/curl/lib/version.c @@ -67,7 +67,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wvla" #endif -#error #include <brotli/decode.h> +#include <brotli/decode.h> #if defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/contrib/libs/curl/ya.make b/contrib/libs/curl/ya.make index 5f875bc0cb..ea28122a8a 100644 --- a/contrib/libs/curl/ya.make +++ b/contrib/libs/curl/ya.make @@ -16,6 +16,8 @@ VERSION(8.5.0) ORIGINAL_SOURCE(https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.bz2) PEERDIR( + contrib/libs/brotli/dec + contrib/libs/brotli/enc contrib/libs/libc_compat contrib/libs/nghttp2 contrib/libs/openssl |