* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/trantor/files/, dev-cpp/trantor/
@ 2021-08-16 21:09 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2021-08-16 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 1704eb33459103bcbd76e9bd5a77970ac72158a9
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon Aug 16 20:56:07 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Aug 16 21:00:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1704eb33
dev-cpp/trantor: New package.
Non-blocking I/O tcp network lib based on c++14/17
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
dev-cpp/trantor/Manifest | 1 +
.../files/trantor-1.5.1_GNUInstallDirs.patch | 34 ++++++++++++++++
dev-cpp/trantor/metadata.xml | 11 +++++
dev-cpp/trantor/trantor-1.5.1.ebuild | 47 ++++++++++++++++++++++
4 files changed, 93 insertions(+)
diff --git a/dev-cpp/trantor/Manifest b/dev-cpp/trantor/Manifest
new file mode 100644
index 000000000..e33bc9152
--- /dev/null
+++ b/dev-cpp/trantor/Manifest
@@ -0,0 +1 @@
+DIST trantor-1.5.1.tar.gz 102696 BLAKE2B 7670b2e2bb56b703aa387df463433261cff33b5a8682681071ff5159d14a516e11faebde7e2431232ba3651f6420a017491a7468ce3f90c4c099284808e27171 SHA512 9f6664abc94943598805192ee09a98340e6e20efb15e448aac5e21480f1798b0991782d18766f5ef54399251d4980c2f68aeda3136c7e058e3c31623c8f7ce3f
diff --git a/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch b/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch
new file mode 100644
index 000000000..2b2b679e8
--- /dev/null
+++ b/dev-cpp/trantor/files/trantor-1.5.1_GNUInstallDirs.patch
@@ -0,0 +1,34 @@
+From 68aa2e7d41002d00c5d3bd3c6a7d55b0ebb8154d Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+Date: Mon, 16 Aug 2021 21:43:59 +0200
+Subject: [PATCH] cmake: Use GNUInstallDirs to figure out install dirs.
+
+And set initial value for INSTALL_BIN_DIR.
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad5a1b3..44ca114 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,12 +11,13 @@ set(TRANTOR_PATCH_VERSION 1)
+ set(TRANTOR_VERSION
+ ${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
+
++include(GNUInstallDirs)
+ # Offer the user the choice of overriding the installation directories
+-set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
++set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
+ set(INSTALL_INCLUDE_DIR
+- include
++ ${CMAKE_INSTALL_INCLUDEDIR}
+ CACHE PATH "Installation directory for header files")
+-set(DEF_INSTALL_TRANTOR_CMAKE_DIR lib/cmake/Trantor)
++set(DEF_INSTALL_TRANTOR_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/Trantor)
+ set(INSTALL_TRANTOR_CMAKE_DIR
+ ${DEF_INSTALL_TRANTOR_CMAKE_DIR}
+ CACHE PATH "Installation directory for cmake files")
+--
+2.31.1
+
diff --git a/dev-cpp/trantor/metadata.xml b/dev-cpp/trantor/metadata.xml
new file mode 100644
index 000000000..69cbec48c
--- /dev/null
+++ b/dev-cpp/trantor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gentoo@tastytea.de</email>
+ <name>Ronny (tastytea) Gutbrod</name>
+ </maintainer>
+ <upstream>
+ <doc>https://trantor.docsforge.com/</doc>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/trantor/trantor-1.5.1.ebuild b/dev-cpp/trantor/trantor-1.5.1.ebuild
new file mode 100644
index 000000000..5e1828bd9
--- /dev/null
+++ b/dev-cpp/trantor/trantor-1.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Non-blocking I/O tcp network lib based on c++14/17"
+HOMEPAGE="https://github.com/an-tao/trantor"
+SRC_URI="https://github.com/an-tao/trantor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="adns doc +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ adns? ( net-dns/c-ares )
+ ssl? ( dev-libs/openssl )
+"
+DEPEND="
+ ${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.1_GNUInstallDirs.patch" )
+
+src_prepare() {
+ use adns || sed -i '/find_package(c-ares)/d' CMakeLists.txt || die
+ use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
+
+ use doc && HTML_DOCS="${BUILD_DIR}/docs/trantor/html/*"
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ "-DBUILD_TRANTOR_SHARED=YES"
+ "-DBUILD_DOC=$(usex doc)"
+ "-DBUILD_TESTING=$(usex test)"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/trantor/files/, dev-cpp/trantor/
@ 2021-10-25 17:17 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2021-10-25 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 9c4239df1c58dfbea05ec9e70afbc2f6e04771a5
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon Oct 25 17:15:48 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Oct 25 17:16:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c4239df
dev-cpp/trantor: Skip adns test when USE="-adns".
Closes: https://bugs.gentoo.org/820212
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
.../trantor/files/trantor-1.5.2_skip-dnstest.patch | 45 ++++++++++++++++++++++
dev-cpp/trantor/trantor-1.5.2.ebuild | 2 +
2 files changed, 47 insertions(+)
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
new file mode 100644
index 000000000..4447c57da
--- /dev/null
+++ b/dev-cpp/trantor/files/trantor-1.5.2_skip-dnstest.patch
@@ -0,0 +1,45 @@
+From 7ebc378255f0c7da11b82c51aa4810fd6a1965d1 Mon Sep 17 00:00:00 2001
+From: tastytea <tastytea@tastytea.de>
+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 2123d8f25..8acfe55df 100644
--- a/dev-cpp/trantor/trantor-1.5.2.ebuild
+++ b/dev-cpp/trantor/trantor-1.5.2.ebuild
@@ -25,6 +25,8 @@ DEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=( "${FILESDIR}/${PN}-1.5.2_skip-dnstest.patch" )
+
src_prepare() {
use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/trantor/files/, dev-cpp/trantor/
@ 2021-10-26 15:51 Ronny Gutbrod
0 siblings, 0 replies; 3+ messages in thread
From: Ronny Gutbrod @ 2021-10-26 15:51 UTC (permalink / raw
To: gentoo-commits
commit: ba9bd9cc1047adc364c930a6948d6c52c7f28619
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Tue Oct 26 15:26:22 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
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 <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)
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 <tastytea@tastytea.de>
-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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-26 15:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-25 17:17 [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/trantor/files/, dev-cpp/trantor/ Ronny Gutbrod
-- strict thread matches above, loose matches on Subject: below --
2021-10-26 15:51 Ronny Gutbrod
2021-08-16 21:09 Ronny Gutbrod
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox