mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-23 05:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-cpp/trantor: Add upstream fix for resolver with USE="-adns".

Browse Source 
Replaces previous workaround.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
This commit is contained in:
Ronny (tastytea) Gutbrod
2021-10-26 17:26:22 +02:00
parent f59f172695
commit ba9bd9cc10
3 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch Normal file
View File

@@ -0,0 +1,62 @@
From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001
From: marty1885 <marty188586@gmail.com>
Date: Tue, 26 Oct 2021 08:37:21 +0800
Subject: [PATCH] make sure resolvers are added when C-Ares is manually
disabled
---
CMakeLists.txt | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49872ef..ade3fe3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,26 +131,31 @@ if(OpenSSL_FOUND)
target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL)
endif()
+set(HAVE_C-ARES NO)
if (BUILD_C-ARES)
find_package(c-ares)
if(c-ares_FOUND)
message(STATUS "c-ares found!")
- target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
- set(TRANTOR_SOURCES
- ${TRANTOR_SOURCES}
- trantor/net/inner/AresResolver.cc)
- set(private_headers
- ${private_headers}
- trantor/net/inner/AresResolver.h)
- else(c-ares_FOUND)
- set(TRANTOR_SOURCES
- ${TRANTOR_SOURCES}
- trantor/net/inner/NormalResolver.cc)
- set(private_headers
- ${private_headers}
- trantor/net/inner/NormalResolver.h)
- endif(c-ares_FOUND)
-endif (BUILD_C-ARES)
+ set(HAVE_C-ARES TRUE)
+ endif()
+endif ()
+
+if(HAVE_C-ARES)
+ target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib)
+ set(TRANTOR_SOURCES
+ ${TRANTOR_SOURCES}
+ trantor/net/inner/AresResolver.cc)
+ set(private_headers
+ ${private_headers}
+ trantor/net/inner/AresResolver.h)
+else()
+ set(TRANTOR_SOURCES
+ ${TRANTOR_SOURCES}
+ trantor/net/inner/NormalResolver.cc)
+ set(private_headers
+ ${private_headers}
+ trantor/net/inner/NormalResolver.h)
+endif()
find_package(Threads)
target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)