[trantor] Update to 1.5.0 (#18534)

* [trantor] Update to 1.5.0

* Add vcpkg_fixup_pkgconfig()
This commit is contained in:
An Tao 2021-06-25 04:13:33 +08:00 committed by GitHub
parent 1d4f578353
commit 80f5457d07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 31 deletions

View File

@ -1,5 +1,5 @@
Source: trantor
Version: 1.4.1
Version: 1.5.0
Homepage: https://github.com/an-tao/trantor
Description: A non-blocking I/O cross-platform TCP network library, using C++14.
Build-Depends: openssl, c-ares

View File

@ -1,12 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/trantor
REF v1.4.1
SHA512 a3d23ea2f9d97a9248d05ecdac5f10bc9b7fffaf9a225e8b1dbd14ace4f7acb33758cca3321774a52d21625a21cb98bb51672f018e8a458f9fff1fb194bec0e6
REF v1.5.0
SHA512 3e9e0f15aa7e039b70141b1ede16fcfe854af961cc787a0a51d4b020581e2b4ae1b51497e3ca31cfc4b5ed11dd9028a1438339cb726d83588f656c99d9938493
HEAD_REF master
PATCHES
vcpkg.patch
ssize_t.patch
)
vcpkg_configure_cmake(
@ -19,6 +18,8 @@ vcpkg_install_cmake()
# Fix CMake files
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Trantor)
vcpkg_fixup_pkgconfig()
# # Remove includes in debug
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

View File

@ -1,26 +0,0 @@
diff --git a/trantor/net/EventLoop.cc b/trantor/net/EventLoop.cc
index b4523ad..8009db4 100644
--- a/trantor/net/EventLoop.cc
+++ b/trantor/net/EventLoop.cc
@@ -26,7 +26,7 @@
#include <assert.h>
#ifdef _WIN32
#include <io.h>
-using ssize_t = std::intptr_t;
+using ssize_t = long long;
#else
#include <poll.h>
#endif
diff --git a/trantor/utils/MsgBuffer.h b/trantor/utils/MsgBuffer.h
index bdd5c23..33c8633 100644
--- a/trantor/utils/MsgBuffer.h
+++ b/trantor/utils/MsgBuffer.h
@@ -22,7 +22,7 @@
#include <assert.h>
#include <string.h>
#ifdef _WIN32
-using ssize_t = std::intptr_t;
+using ssize_t = long long;
#endif
namespace trantor

View File

@ -6309,7 +6309,7 @@
"port-version": 0
},
"trantor": {
"baseline": "1.4.1",
"baseline": "1.5.0",
"port-version": 0
},
"tre": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "82647f91d6290a85e1b03801e75e17698b3da691",
"version-string": "1.5.0",
"port-version": 0
},
{
"git-tree": "f53004074d57fe4748b87a81dcc59f35a20715ce",
"version-string": "1.4.1",