Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[rpclib] Avoid stdext::checked_array_iterator. (#51802)

This commit is contained in:
Billy O'Neal 2026-05-16 01:42:57 -07:00 committed by GitHub
parent 33e0ee41d7
commit 20e8f91844
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 60 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/rpclib/avoid-stdext-checked-array-iterator.diff Normal file
View File

@ -0,0 +1,13 @@
diff --git a/dependencies/include/format.h b/dependencies/include/format.h
index 3683993..e88b214 100644
--- a/dependencies/include/format.h
+++ b/dependencies/include/format.h
@@ -53,7 +53,7 @@ typedef long long intmax_t;
# include <ostream>
#endif
-#ifdef _SECURE_SCL
+#if defined(_SECURE_SCL) && defined(_MSC_VER) && _MSC_VER < 1951
# define FMT_SECURE_SCL _SECURE_SCL
#else
# define FMT_SECURE_SCL 0

37
ports/rpclib/fix-arm64-windows.diff Normal file
View File

@ -0,0 +1,37 @@
diff --git a/include/rpc/msgpack/predef/architecture/arm.h b/include/rpc/msgpack/predef/architecture/arm.h
index 20a1e6b..82f8a9b 100644
--- a/include/rpc/msgpack/predef/architecture/arm.h
+++ b/include/rpc/msgpack/predef/architecture/arm.h
@@ -27,11 +27,13 @@ http://www.boost.org/LICENSE_1_0.txt)
[[`__TARGET_ARCH_ARM`] [__predef_detection__]]
[[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
[[`_M_ARM`] [__predef_detection__]]
+ [[`_M_ARM64`] [__predef_detection__]]
[[`__arm64`] [8.0.0]]
[[`__TARGET_ARCH_ARM`] [V.0.0]]
[[`__TARGET_ARCH_THUMB`] [V.0.0]]
[[`_M_ARM`] [V.0.0]]
+ [[`_M_ARM64`] [V.0.0]]
]
*/
@@ -39,7 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt)
#if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
- defined(_M_ARM)
+ defined(_M_ARM) || defined(_M_ARM64)
# undef MSGPACK_ARCH_ARM
# if !defined(MSGPACK_ARCH_ARM) && defined(__arm64)
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(8,0,0)
@@ -53,6 +55,9 @@ http://www.boost.org/LICENSE_1_0.txt)
# if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM)
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(_M_ARM,0,0)
# endif
+# if !defined(MSGPACK_ARCH_ARM) && defined(_M_ARM64)
+# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER(_M_ARM64,0,0)
+# endif
# if !defined(MSGPACK_ARCH_ARM)
# define MSGPACK_ARCH_ARM MSGPACK_VERSION_NUMBER_AVAILABLE
# endif

3
ports/rpclib/portfile.cmake
View File

@ -6,6 +6,9 @@ vcpkg_from_github(
REF v2.3.0
SHA512 9C65AE5D000CD66E39498667DC826A4E8A2C28EB4138CFFE3AA09D5DDC22575551B9FA6CE9D951343213B9583F947899CB18B58130AEAEE36DAB5881EA496272
HEAD_REF master
PATCHES
avoid-stdext-checked-array-iterator.diff # https://github.com/rpclib/rpclib/pull/325
fix-arm64-windows.diff # https://github.com/rpclib/rpclib/pull/326
)
vcpkg_cmake_configure(

2
ports/rpclib/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "rpclib",
"version-semver": "2.3.0",
"port-version": 2,
"port-version": 3,
"description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.",
"homepage": "https://github.com/rpclib/rpclib",
"dependencies": [

2
scripts/ci.baseline.txt
View File

@ -1055,8 +1055,6 @@ rmqcpp:x64-windows-static-md=fail
rmqcpp:x64-windows-static=fail
rmqcpp:x64-windows=fail
rmqcpp:x86-windows=fail
rpclib:arm64-windows-static-md=fail
rpclib:arm64-windows=fail
rtmidi:arm-neon-android=fail
rtmidi:arm64-android=fail
rtmidi:x64-android=fail

1
scripts/ci.feature.baseline.txt
View File

@ -1281,7 +1281,6 @@ ripper37-libbase[wx]:arm64-linux=cascade
ripper37-libbase[wx](android)=cascade
robotraconteur:arm64-linux=cascade
robotraconteur-companion:arm64-linux=cascade
rpclib:arm64-windows=fail
rsocket:arm64-linux=cascade
rsocket:arm64-windows=cascade
rsocket:x86-windows=cascade

2
versions/baseline.json
View File

@ -8866,7 +8866,7 @@
},
"rpclib": {
"baseline": "2.3.0",
"port-version": 2
"port-version": 3
},
"rply": {
"baseline": "1.1.4",

5
versions/r-/rpclib.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2681af7a439d2e7455b991b376e7dd529108b9df",
"version-semver": "2.3.0",
"port-version": 3
},
{
"git-tree": "0bf42157905ee1aa4686ab978e6a17f650f78434",
"version-semver": "2.3.0",