From 02d5b18290e24617c776f49ec363e30d58c0d790 Mon Sep 17 00:00:00 2001 From: Daniil Cherednik Date: Mon, 5 Feb 2024 12:17:28 +0000 Subject: [PATCH] Fix crash during run s3 backup. AWS uses libcurl which uses patched version of c-ares header which binary incompatible with c-ares from conan. --- contrib/libs/curl/CMakeLists.darwin-x86_64.txt | 1 - contrib/libs/curl/CMakeLists.linux-aarch64.txt | 1 - contrib/libs/curl/CMakeLists.linux-x86_64.txt | 1 - contrib/libs/curl/CMakeLists.windows-x86_64.txt | 1 - contrib/libs/curl/ya.make | 7 ++++++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/libs/curl/CMakeLists.darwin-x86_64.txt b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt index 6dcd71469bd6..fd2e584f36e8 100644 --- a/contrib/libs/curl/CMakeLists.darwin-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.darwin-x86_64.txt @@ -21,7 +21,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.linux-aarch64.txt b/contrib/libs/curl/CMakeLists.linux-aarch64.txt index 8b2de2eb4176..14f348adee3d 100644 --- a/contrib/libs/curl/CMakeLists.linux-aarch64.txt +++ b/contrib/libs/curl/CMakeLists.linux-aarch64.txt @@ -21,7 +21,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.linux-x86_64.txt b/contrib/libs/curl/CMakeLists.linux-x86_64.txt index 8b2de2eb4176..14f348adee3d 100644 --- a/contrib/libs/curl/CMakeLists.linux-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.linux-x86_64.txt @@ -21,7 +21,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/CMakeLists.windows-x86_64.txt b/contrib/libs/curl/CMakeLists.windows-x86_64.txt index 4d72bbd0b504..3722de0948a1 100644 --- a/contrib/libs/curl/CMakeLists.windows-x86_64.txt +++ b/contrib/libs/curl/CMakeLists.windows-x86_64.txt @@ -21,7 +21,6 @@ target_include_directories(contrib-libs-curl PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/curl/include ) target_include_directories(contrib-libs-curl PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/c-ares/include ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib ) target_link_libraries(contrib-libs-curl PUBLIC diff --git a/contrib/libs/curl/ya.make b/contrib/libs/curl/ya.make index 436fb0985edc..a46e0b7dc600 100644 --- a/contrib/libs/curl/ya.make +++ b/contrib/libs/curl/ya.make @@ -21,9 +21,14 @@ PEERDIR( contrib/libs/zlib ) +IF (NOT EXPORT_CMAKE) + ADDINCL( + contrib/libs/c-ares/include + ) +ENDIF() + ADDINCL( GLOBAL contrib/libs/curl/include - contrib/libs/c-ares/include contrib/libs/curl/lib )