commit: ba9bd9cc1047adc364c930a6948d6c52c7f28619 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> AuthorDate: Tue Oct 26 15:26:22 2021 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Oct 26 15:26:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba9bd9cc
dev-cpp/trantor: Add upstream fix for resolver with USE="-adns". Replaces previous workaround. Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch | 62 ++++++++++++++++++++++ .../trantor/files/trantor-1.5.2_skip-dnstest.patch | 45 ---------------- dev-cpp/trantor/trantor-1.5.2.ebuild | 2 +- 3 files changed, 63 insertions(+), 46 deletions(-) diff --git a/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch b/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch new file mode 100644 index 000000000..683d987ce --- /dev/null +++ b/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch @@ -0,0 +1,62 @@ +From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001 +From: marty1885 <[email protected]> +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) diff --git a/dev-cpp/trantor/files/trantor-1.5.2_skip-dnstest.patch b/dev-cpp/trantor/files/trantor-1.5.2_skip-dnstest.patch deleted file mode 100644 index 4447c57da..000000000 --- a/dev-cpp/trantor/files/trantor-1.5.2_skip-dnstest.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7ebc378255f0c7da11b82c51aa4810fd6a1965d1 Mon Sep 17 00:00:00 2001 -From: tastytea <[email protected]> -Date: Mon, 25 Oct 2021 18:35:17 +0200 -Subject: [PATCH] Skip DnsTest test when compiling without BUILD_C-ARES. - -Compiling DnsTest.cc fails without c-ares. ---- - trantor/tests/CMakeLists.txt | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/trantor/tests/CMakeLists.txt b/trantor/tests/CMakeLists.txt -index 052dd49..1926614 100644 ---- a/trantor/tests/CMakeLists.txt -+++ b/trantor/tests/CMakeLists.txt -@@ -15,7 +15,9 @@ add_executable(async_file_logger_test1 AsyncFileLoggerTest1.cc) - add_executable(sendfile_test SendfileTest.cc) - add_executable(timing_wheel_test TimingWheelTest.cc) - add_executable(kickoff_test KickoffTest.cc) --add_executable(dns_test DnsTest.cc) -+if (BUILD_C-ARES) -+ add_executable(dns_test DnsTest.cc) -+endif() - add_executable(delayed_ssl_server_test DelayedSSLServerTest.cc) - add_executable(delayed_ssl_client_test DelayedSSLClientTest.cc) - add_executable(run_on_quit_test RunOnQuitTest.cc) -@@ -38,12 +40,15 @@ set(targets_list - sendfile_test - timing_wheel_test - kickoff_test -- dns_test - delayed_ssl_server_test - delayed_ssl_client_test - run_on_quit_test - path_conversion_test) - -+if (BUILD_C-ARES) -+ list(APPEND targets_list dns_test) -+endif() -+ - set_property(TARGET ${targets_list} PROPERTY CXX_STANDARD 14) - set_property(TARGET ${targets_list} PROPERTY CXX_STANDARD_REQUIRED ON) - set_property(TARGET ${targets_list} PROPERTY CXX_EXTENSIONS OFF) --- -2.32.0 - diff --git a/dev-cpp/trantor/trantor-1.5.2.ebuild b/dev-cpp/trantor/trantor-1.5.2.ebuild index 8acfe55df..d33d32ba1 100644 --- a/dev-cpp/trantor/trantor-1.5.2.ebuild +++ b/dev-cpp/trantor/trantor-1.5.2.ebuild @@ -25,7 +25,7 @@ DEPEND=" test? ( dev-cpp/gtest ) " -PATCHES=( "${FILESDIR}/${PN}-1.5.2_skip-dnstest.patch" ) +PATCHES=( "${FILESDIR}/${PN}-1.5.2_adns-fix.patch" ) src_prepare() { use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
