mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:39:06 +08:00
[grpc][openssl][upb] Fix install on uwp (#10366)
* [grpc][openssl][upb] Fix install on uwp * [upb] Remove unneeded changes * [libodb-mysql] Disable parallel configure due to source writes * [curl] Use openssl for UWP since SSPI is unsupported * [ci.baseline] Update
This commit is contained in:
commit
f9e10d656f
@ -1,5 +1,5 @@
|
||||
Source: curl
|
||||
Version: 7.68.0-1
|
||||
Version: 7.68.0-2
|
||||
Build-Depends: zlib
|
||||
Homepage: https://github.com/curl/curl
|
||||
Description: A library for transferring data with URLs
|
||||
@ -12,15 +12,15 @@ Feature: non-http
|
||||
Description: Enables protocols beyond HTTP/HTTPS/HTTP2
|
||||
|
||||
Feature: http2
|
||||
Build-Depends: nghttp2, curl[ssl]
|
||||
Build-Depends: nghttp2, curl[core,ssl]
|
||||
Description: HTTP2 support
|
||||
|
||||
Feature: ssl
|
||||
Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[sectransp] (osx)
|
||||
Build-Depends: curl[core,openssl] ((uwp|!windows)&!osx), curl[core,winssl] (windows&!uwp), curl[core,sectransp] (osx)
|
||||
Description: Default SSL backend
|
||||
|
||||
Feature: ssh
|
||||
Build-Depends: curl[openssl], libssh2, curl[non-http]
|
||||
Build-Depends: curl[core,openssl], libssh2, curl[core,non-http]
|
||||
Description: SSH support via libssh2
|
||||
|
||||
# SSL backends
|
||||
@ -30,6 +30,7 @@ Description: SSL support (OpenSSL)
|
||||
|
||||
Feature: winssl
|
||||
Description: SSL support (Secure Channel / "WinSSL")
|
||||
Build-Depends: curl[core,sspi]
|
||||
|
||||
Feature: mbedtls
|
||||
Build-Depends: mbedtls
|
||||
@ -42,7 +43,7 @@ Feature: c-ares
|
||||
Build-Depends: c-ares
|
||||
Description: c-ares support
|
||||
|
||||
Feature:sspi
|
||||
Feature: sspi
|
||||
Description: SSPI support
|
||||
|
||||
Feature: brotli
|
||||
|
@ -15,6 +15,7 @@ vcpkg_from_github(
|
||||
00004-link-gdi32-on-windows.patch
|
||||
00005-fix-uwp-error.patch
|
||||
00009-use-system-upb.patch
|
||||
snprintf.patch
|
||||
)
|
||||
|
||||
if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
|
||||
|
12
ports/grpc/snprintf.patch
Normal file
12
ports/grpc/snprintf.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
index c638ce7..3dc3b2e 100644
|
||||
--- a/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
+++ b/src/core/tsi/alts/crypt/aes_gcm.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/hmac.h>
|
||||
#include <string.h>
|
||||
+#include <cstdio>
|
||||
|
||||
#include <grpc/support/alloc.h>
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: libodb-mysql
|
||||
Version: 2.4.0-5
|
||||
Version: 2.4.0-6
|
||||
Homepage: https://www.codesynthesis.com/products/odb/
|
||||
Description: MySQL support for the ODB ORM library
|
||||
Build-Depends: libodb, libmysql
|
||||
|
@ -23,6 +23,7 @@ set(MYSQL_LIB "${CURRENT_INSTALLED_DIR}/lib/libmysql.lib")
|
||||
set(MYSQL_LIB_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/libmysql.lib")
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR}
|
||||
|
@ -2,4 +2,4 @@ Source: openssl
|
||||
Version: 1.1.1d
|
||||
Homepage: https://www.openssl.org
|
||||
Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
|
||||
Build-Depends: openssl-windows (windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows)
|
||||
Build-Depends: openssl-windows (!uwp&windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows)
|
@ -1616,6 +1616,8 @@ shogun:x64-uwp = skip
|
||||
shogun:x64-windows = skip
|
||||
shogun:x64-windows-static = skip
|
||||
shogun:x86-windows = skip
|
||||
signalrclient:x64-uwp=fail
|
||||
signalrclient:arm-uwp=fail
|
||||
simdjson:arm64-windows=fail
|
||||
simdjson:arm-uwp=fail
|
||||
simdjson:x86-windows=fail
|
||||
|
Loading…
Reference in New Issue
Block a user