diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-10-27 20:48:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 20:48:14 -0700 |
| commit | a6a1722cfa94caa5db98848679b99377bc5a0112 (patch) | |
| tree | 0f17c63e4a0551866280600e466f21267c8ae1ce /ports | |
| parent | c34c4189ebbf0795e1f8e2de562c527a854c8db4 (diff) | |
| download | vcpkg-a6a1722cfa94caa5db98848679b99377bc5a0112.tar.gz vcpkg-a6a1722cfa94caa5db98848679b99377bc5a0112.zip | |
[vcpkg, jsonnet, openssl-uwp] Enable use of the system powershell-core if it is present. (#13805)
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/jsonnet/CONTROL | 1 | ||||
| -rw-r--r-- | ports/jsonnet/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/openssl-uwp/CONTROL | 1 | ||||
| -rw-r--r-- | ports/openssl-uwp/EnableUWPSupport.patch | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL index 99d73af6c..b069a6b1b 100644 --- a/ports/jsonnet/CONTROL +++ b/ports/jsonnet/CONTROL @@ -1,5 +1,6 @@ Source: jsonnet Version: 0.16.0 +Port-Version: 1 Homepage: https://github.com/google/jsonnet Description: Jsonnet - The data templating language Build-Depends: nlohmann-json diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 77e8b8783..b2769cd85 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -15,8 +15,9 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_execute_required_process( - COMMAND Powershell -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\"" + find_program(PWSH_PATH pwsh) + vcpkg_execute_required_process( + COMMAND "${PWSH_PATH}" -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\"" WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME "std.jsonnet" ) diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL index 6d42b3af0..cdf818e33 100644 --- a/ports/openssl-uwp/CONTROL +++ b/ports/openssl-uwp/CONTROL @@ -1,4 +1,5 @@ Source: openssl-uwp Version: 1.1.1h +Port-Version: 1 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. Supports: uwp diff --git a/ports/openssl-uwp/EnableUWPSupport.patch b/ports/openssl-uwp/EnableUWPSupport.patch index d534b9b4a..4313220f1 100644 --- a/ports/openssl-uwp/EnableUWPSupport.patch +++ b/ports/openssl-uwp/EnableUWPSupport.patch @@ -54,7 +54,7 @@ index d478f42b0f..e0fb70daca 100644 +my $UWP_info = {}; +sub UWP_info { + unless (%$UWP_info) { -+ my $SDKver = `powershell -Command \"& {\$(Get-Item \\\"hklm:\\SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\\").GetValue(\\\"CurrentVersion\\\")}\"`; ++ my $SDKver = `pwsh.exe -Command \"& {\$(Get-Item \\\"hklm:\\SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\\").GetValue(\\\"CurrentVersion\\\")}\"`; + $SDKver =~ s|\R$||; + my @SDKver_split = split(/\./, $SDKver); + # SDK version older than 10.0.17763 don't support our ASM builds |