aboutsummaryrefslogtreecommitdiff
path: root/ports/openssl-uwp
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-10-27 20:48:14 -0700
committerGitHub <noreply@github.com>2020-10-27 20:48:14 -0700
commita6a1722cfa94caa5db98848679b99377bc5a0112 (patch)
tree0f17c63e4a0551866280600e466f21267c8ae1ce /ports/openssl-uwp
parentc34c4189ebbf0795e1f8e2de562c527a854c8db4 (diff)
downloadvcpkg-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/openssl-uwp')
-rw-r--r--ports/openssl-uwp/CONTROL1
-rw-r--r--ports/openssl-uwp/EnableUWPSupport.patch2
2 files changed, 2 insertions, 1 deletions
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