1 |
commit: ba9bd9cc1047adc364c930a6948d6c52c7f28619 |
2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
3 |
AuthorDate: Tue Oct 26 15:26:22 2021 +0000 |
4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
5 |
CommitDate: Tue Oct 26 15:26:22 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba9bd9cc |
7 |
|
8 |
dev-cpp/trantor: Add upstream fix for resolver with USE="-adns". |
9 |
|
10 |
Replaces previous workaround. |
11 |
|
12 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
13 |
|
14 |
dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch | 62 ++++++++++++++++++++++ |
15 |
.../trantor/files/trantor-1.5.2_skip-dnstest.patch | 45 ---------------- |
16 |
dev-cpp/trantor/trantor-1.5.2.ebuild | 2 +- |
17 |
3 files changed, 63 insertions(+), 46 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 000000000..683d987ce |
22 |
--- /dev/null |
23 |
+++ b/dev-cpp/trantor/files/trantor-1.5.2_adns-fix.patch |
24 |
@@ -0,0 +1,62 @@ |
25 |
+From ce8bbc196f12ebcfc180e9ab546e9a395afceb88 Mon Sep 17 00:00:00 2001 |
26 |
+From: marty1885 <marty188586@×××××.com> |
27 |
+Date: Tue, 26 Oct 2021 08:37:21 +0800 |
28 |
+Subject: [PATCH] make sure resolvers are added when C-Ares is manually |
29 |
+ disabled |
30 |
+ |
31 |
+--- |
32 |
+ CMakeLists.txt | 37 +++++++++++++++++++++---------------- |
33 |
+ 1 file changed, 21 insertions(+), 16 deletions(-) |
34 |
+ |
35 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
36 |
+index 49872ef..ade3fe3 100755 |
37 |
+--- a/CMakeLists.txt |
38 |
++++ b/CMakeLists.txt |
39 |
+@@ -131,26 +131,31 @@ if(OpenSSL_FOUND) |
40 |
+ target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENSSL) |
41 |
+ endif() |
42 |
+ |
43 |
++set(HAVE_C-ARES NO) |
44 |
+ if (BUILD_C-ARES) |
45 |
+ find_package(c-ares) |
46 |
+ if(c-ares_FOUND) |
47 |
+ message(STATUS "c-ares found!") |
48 |
+- target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) |
49 |
+- set(TRANTOR_SOURCES |
50 |
+- ${TRANTOR_SOURCES} |
51 |
+- trantor/net/inner/AresResolver.cc) |
52 |
+- set(private_headers |
53 |
+- ${private_headers} |
54 |
+- trantor/net/inner/AresResolver.h) |
55 |
+- else(c-ares_FOUND) |
56 |
+- set(TRANTOR_SOURCES |
57 |
+- ${TRANTOR_SOURCES} |
58 |
+- trantor/net/inner/NormalResolver.cc) |
59 |
+- set(private_headers |
60 |
+- ${private_headers} |
61 |
+- trantor/net/inner/NormalResolver.h) |
62 |
+- endif(c-ares_FOUND) |
63 |
+-endif (BUILD_C-ARES) |
64 |
++ set(HAVE_C-ARES TRUE) |
65 |
++ endif() |
66 |
++endif () |
67 |
++ |
68 |
++if(HAVE_C-ARES) |
69 |
++ target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) |
70 |
++ set(TRANTOR_SOURCES |
71 |
++ ${TRANTOR_SOURCES} |
72 |
++ trantor/net/inner/AresResolver.cc) |
73 |
++ set(private_headers |
74 |
++ ${private_headers} |
75 |
++ trantor/net/inner/AresResolver.h) |
76 |
++else() |
77 |
++ set(TRANTOR_SOURCES |
78 |
++ ${TRANTOR_SOURCES} |
79 |
++ trantor/net/inner/NormalResolver.cc) |
80 |
++ set(private_headers |
81 |
++ ${private_headers} |
82 |
++ trantor/net/inner/NormalResolver.h) |
83 |
++endif() |
84 |
+ |
85 |
+ find_package(Threads) |
86 |
+ target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads) |
87 |
|
88 |
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 |
89 |
deleted file mode 100644 |
90 |
index 4447c57da..000000000 |
91 |
--- a/dev-cpp/trantor/files/trantor-1.5.2_skip-dnstest.patch |
92 |
+++ /dev/null |
93 |
@@ -1,45 +0,0 @@ |
94 |
-From 7ebc378255f0c7da11b82c51aa4810fd6a1965d1 Mon Sep 17 00:00:00 2001 |
95 |
-From: tastytea <tastytea@××××××××.de> |
96 |
-Date: Mon, 25 Oct 2021 18:35:17 +0200 |
97 |
-Subject: [PATCH] Skip DnsTest test when compiling without BUILD_C-ARES. |
98 |
- |
99 |
-Compiling DnsTest.cc fails without c-ares. |
100 |
---- |
101 |
- trantor/tests/CMakeLists.txt | 9 +++++++-- |
102 |
- 1 file changed, 7 insertions(+), 2 deletions(-) |
103 |
- |
104 |
-diff --git a/trantor/tests/CMakeLists.txt b/trantor/tests/CMakeLists.txt |
105 |
-index 052dd49..1926614 100644 |
106 |
---- a/trantor/tests/CMakeLists.txt |
107 |
-+++ b/trantor/tests/CMakeLists.txt |
108 |
-@@ -15,7 +15,9 @@ add_executable(async_file_logger_test1 AsyncFileLoggerTest1.cc) |
109 |
- add_executable(sendfile_test SendfileTest.cc) |
110 |
- add_executable(timing_wheel_test TimingWheelTest.cc) |
111 |
- add_executable(kickoff_test KickoffTest.cc) |
112 |
--add_executable(dns_test DnsTest.cc) |
113 |
-+if (BUILD_C-ARES) |
114 |
-+ add_executable(dns_test DnsTest.cc) |
115 |
-+endif() |
116 |
- add_executable(delayed_ssl_server_test DelayedSSLServerTest.cc) |
117 |
- add_executable(delayed_ssl_client_test DelayedSSLClientTest.cc) |
118 |
- add_executable(run_on_quit_test RunOnQuitTest.cc) |
119 |
-@@ -38,12 +40,15 @@ set(targets_list |
120 |
- sendfile_test |
121 |
- timing_wheel_test |
122 |
- kickoff_test |
123 |
-- dns_test |
124 |
- delayed_ssl_server_test |
125 |
- delayed_ssl_client_test |
126 |
- run_on_quit_test |
127 |
- path_conversion_test) |
128 |
- |
129 |
-+if (BUILD_C-ARES) |
130 |
-+ list(APPEND targets_list dns_test) |
131 |
-+endif() |
132 |
-+ |
133 |
- set_property(TARGET ${targets_list} PROPERTY CXX_STANDARD 14) |
134 |
- set_property(TARGET ${targets_list} PROPERTY CXX_STANDARD_REQUIRED ON) |
135 |
- set_property(TARGET ${targets_list} PROPERTY CXX_EXTENSIONS OFF) |
136 |
--- |
137 |
-2.32.0 |
138 |
- |
139 |
|
140 |
diff --git a/dev-cpp/trantor/trantor-1.5.2.ebuild b/dev-cpp/trantor/trantor-1.5.2.ebuild |
141 |
index 8acfe55df..d33d32ba1 100644 |
142 |
--- a/dev-cpp/trantor/trantor-1.5.2.ebuild |
143 |
+++ b/dev-cpp/trantor/trantor-1.5.2.ebuild |
144 |
@@ -25,7 +25,7 @@ DEPEND=" |
145 |
test? ( dev-cpp/gtest ) |
146 |
" |
147 |
|
148 |
-PATCHES=( "${FILESDIR}/${PN}-1.5.2_skip-dnstest.patch" ) |
149 |
+PATCHES=( "${FILESDIR}/${PN}-1.5.2_adns-fix.patch" ) |
150 |
|
151 |
src_prepare() { |
152 |
use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die |