From 670a2656df7ac34937ad4eb7c14eeba772954c9d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 9 Mar 2020 16:37:52 -0700 Subject: [grpc][openssl][upb] Fix install on uwp --- ports/grpc/portfile.cmake | 1 + ports/grpc/snprintf.patch | 12 ++++++++++++ ports/openssl/CONTROL | 2 +- ports/upb/CONTROL | 2 +- ports/upb/fix-uwp.patch | 15 +++++++++++++++ ports/upb/portfile.cmake | 6 ++++-- 6 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 ports/grpc/snprintf.patch create mode 100644 ports/upb/fix-uwp.patch diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index efebdb0fa..96d56097a 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -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") diff --git a/ports/grpc/snprintf.patch b/ports/grpc/snprintf.patch new file mode 100644 index 000000000..f658f9c4f --- /dev/null +++ b/ports/grpc/snprintf.patch @@ -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 + #include + #include ++#include + + #include + diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index ec827f4da..7c62094b6 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -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) \ No newline at end of file +Build-Depends: openssl-windows (!uwp&windows), openssl-uwp (uwp), openssl-unix (!uwp&!windows) \ No newline at end of file diff --git a/ports/upb/CONTROL b/ports/upb/CONTROL index cb9b6041d..4ca52fa03 100644 --- a/ports/upb/CONTROL +++ b/ports/upb/CONTROL @@ -1,4 +1,4 @@ Source: upb -Version: 2019-10-21-1 +Version: 2019-10-21-2 Homepage: https://github.com/protocolbuffers/upb/ Description: μpb (often written 'upb') is a small protobuf implementation written in C. diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch new file mode 100644 index 000000000..b9fc02db7 --- /dev/null +++ b/ports/upb/fix-uwp.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6eb8bb5..1506a64 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,10 @@ cmake_policy(SET CMP0048 NEW) + + project(upb) + ++add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++if(MSVC) ++ add_compile_options(/wd4146) ++endif() + + # Prevent CMake from setting -rdynamic on Linux (!!). + SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake index b5a46253c..6d8e8dd1f 100644 --- a/ports/upb/portfile.cmake +++ b/ports/upb/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF 9effcbcb27f0a665f9f345030188c0b291e32482 + REF 9effcbcb27f0a665f9f345030188c0b291e32482 SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e HEAD_REF master - PATCHES add-cmake-install.patch + PATCHES + add-cmake-install.patch + fix-uwp.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From db225cdf749d8d6788f40200b253a3d6f58b9a3b Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 10 Mar 2020 09:33:28 -0700 Subject: [upb] Remove unneeded changes --- ports/upb/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake index 6d8e8dd1f..9d475670e 100644 --- a/ports/upb/portfile.cmake +++ b/ports/upb/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF 9effcbcb27f0a665f9f345030188c0b291e32482 + REF 9effcbcb27f0a665f9f345030188c0b291e32482 SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e HEAD_REF master PATCHES -- cgit v1.2.3 From e9cbcfde5bcc751e1d845876fcfa651d52565b9c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 10 Mar 2020 09:35:50 -0700 Subject: [libodb-mysql] Disable parallel configure due to source writes --- ports/libodb-mysql/CONTROL | 2 +- ports/libodb-mysql/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/libodb-mysql/CONTROL b/ports/libodb-mysql/CONTROL index 0ac4e211a..53db9a2ff 100644 --- a/ports/libodb-mysql/CONTROL +++ b/ports/libodb-mysql/CONTROL @@ -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 diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index 479d2726e..7731c167a 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -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} -- cgit v1.2.3 From 6b0b9c36124c8559426bf5a9a293bee723baf056 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 10 Mar 2020 09:59:38 -0700 Subject: [curl] Use openssl for UWP since SSPI is unsupported --- ports/curl/CONTROL | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 6a6060bba..05efb2174 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -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 -- cgit v1.2.3 From f653a4a842d5870192a6634ae9840e5cbc641164 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 10 Mar 2020 09:59:43 -0700 Subject: [ci.baseline] Update --- scripts/ci.baseline.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0834ee62a..7a9bfbadb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1618,6 +1618,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 -- cgit v1.2.3