mirror of https://github.com/microsoft/vcpkg.git
[capnproto] Update to 1.5.0 (#52845)
This commit is contained in:
parent
3675b5c61d
commit
af629d8717
|
|
@ -1,14 +1,5 @@
|
|||
From 306220e57881064da99f89ad4192b3e19c7953a9 Mon Sep 17 00:00:00 2001
|
||||
From: Stig Hornang <shornang@gmail.com>
|
||||
Date: Thu, 31 Aug 2023 21:20:09 +0200
|
||||
Subject: [PATCH] Undef KJ_USE_EPOLL for ANDROID_PLATFORM < 23
|
||||
|
||||
---
|
||||
c++/src/kj/async-unix.h | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
|
||||
index 665305ea..c5f195cf 100644
|
||||
index e66ad8e4..fe8d803c 100644
|
||||
--- a/c++/src/kj/async-unix.h
|
||||
+++ b/c++/src/kj/async-unix.h
|
||||
@@ -34,7 +34,10 @@
|
||||
|
|
@ -23,6 +14,3 @@ index 665305ea..c5f195cf 100644
|
|||
// Default to epoll on Linux.
|
||||
#define KJ_USE_EPOLL 1
|
||||
#elif __APPLE__ || __FreeBSD__ || __NetBSD__ || __DragonFly__
|
||||
--
|
||||
2.41.0.windows.3
|
||||
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
|
||||
index afc8ff6a..a311106f 100644
|
||||
--- a/c++/CMakeLists.txt
|
||||
+++ b/c++/CMakeLists.txt
|
||||
@@ -218,6 +218,9 @@ if(NOT MSVC)
|
||||
set(PTHREAD_CFLAGS "-pthread")
|
||||
endif()
|
||||
set(STDLIB_FLAG) # TODO: Unsupported
|
||||
+if(WIN32)
|
||||
+ set(ASYNC_LIBS "-lws2_32")
|
||||
+endif()
|
||||
set(CAPNP_PKG_CONFIG_FILES
|
||||
pkgconfig/kj.pc
|
||||
pkgconfig/capnp.pc
|
||||
@@ -233,13 +233,18 @@ if(NOT CAPNP_LITE)
|
||||
pkgconfig/kj-gzip.pc
|
||||
pkgconfig/kj-http.pc
|
||||
pkgconfig/kj-test.pc
|
||||
- pkgconfig/kj-tls.pc
|
||||
pkgconfig/capnp-rpc.pc
|
||||
pkgconfig/capnp-websocket.pc
|
||||
pkgconfig/capnp-json.pc
|
||||
)
|
||||
endif()
|
||||
|
||||
+if(WITH_OPENSSL)
|
||||
+ list(APPEND CAPNP_PKG_CONFIG_FILES
|
||||
+ pkgconfig/kj-tls.pc
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
foreach(pcfile ${CAPNP_PKG_CONFIG_FILES})
|
||||
configure_file(${pcfile}.in "${CMAKE_CURRENT_BINARY_DIR}/${pcfile}" @ONLY)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${pcfile}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
|
||||
diff --git a/c++/pkgconfig/kj-tls.pc.in b/c++/pkgconfig/kj-tls.pc.in
|
||||
index 22b8292..a4463cd 100644
|
||||
--- a/c++/pkgconfig/kj-tls.pc.in
|
||||
+++ b/c++/pkgconfig/kj-tls.pc.in
|
||||
@@ -8,4 +8,5 @@ Description: Basic utility library called KJ (TLS part)
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lkj-tls @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
|
||||
Requires: kj-async = @VERSION@
|
||||
+Requires.private: openssl
|
||||
Cflags: -I${includedir} @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
|
||||
diff --git a/c++/pkgconfig/kj-async.pc.in b/c++/pkgconfig/kj-async.pc.in
|
||||
index 1a7a55f..4e2c765 100644
|
||||
--- a/c++/pkgconfig/kj-async.pc.in
|
||||
+++ b/c++/pkgconfig/kj-async.pc.in
|
||||
@@ -8,4 +8,4 @@ Description: Basic utility library called KJ (async part)
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lkj-async @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ @STDLIB_FLAG@
|
||||
Requires: kj = @VERSION@
|
||||
-Cflags: -I${includedir} @ASYNC_LIBS@ @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
|
||||
+Cflags: -I${includedir} @PTHREAD_CFLAGS@ @STDLIB_FLAG@ @CAPNP_LITE_FLAG@
|
||||
|
|
@ -4,10 +4,11 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO capnproto/capnproto
|
||||
REF "v${VERSION}"
|
||||
SHA512 6f31294ffe613b28ee891a7e7465d35781697dc7ed51f806b7c707c8fc94ead01099ab356041646e382320ff922f40c393b4b58f3106bbc3fb547386d7c0ed1a
|
||||
SHA512 d3072f590212d40010fa7946e000ac9fe927c9058fcda518c14275c7a217207db644d44a124398873d3875bb5f1f8e52dbeccfbc4b4c003e8e35fd83486fc343
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
undef-KJ_USE_EPOLL-for-ANDROID_PLATFORM-23.patch
|
||||
001-fix-android.patch
|
||||
002-fix-pkg-config.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "capnproto",
|
||||
"version": "1.4.0",
|
||||
"version": "1.5.0",
|
||||
"description": "Data interchange format and capability-based RPC system",
|
||||
"homepage": "https://capnproto.org/",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -1609,7 +1609,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"capnproto": {
|
||||
"baseline": "1.4.0",
|
||||
"baseline": "1.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"capstone": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4481676fe7cef3f10d7f837e72ecc2a545575d15",
|
||||
"version": "1.5.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "325f815976b1e585cb60be7f6bd85cba7a44e955",
|
||||
"version": "1.4.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue