mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:06:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openssl] Remove vcpkg_fail_port_install. (#22755)

Browse Source 
The only places this was being used were as morally asserts for the port itself. Also removed empty ports from ci.baseline.txt.

In support of https://github.com/microsoft/vcpkg/pull/21502
This commit is contained in:
Billy O'Neal 2022-01-24 13:35:21 -08:00 committed by GitHub
parent b3755cb89f
commit fb1df5721e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/openssl/unix/portfile.cmake
View File

@ -1,7 +1,3 @@
if (NOT VCPKG_TARGET_IS_MINGW)
vcpkg_fail_port_install(MESSAGE "${PORT} is only for openssl on Unix-like systems" ON_TARGET "UWP" "Windows")
endif()
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH
ARCHIVE "${ARCHIVE}"

2
ports/openssl/uwp/portfile.cmake
View File

@ -1,5 +1,3 @@
vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX")
vcpkg_find_acquire_program(JOM)
get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
vcpkg_add_to_path("${PERL_EXE_PATH}")

1
ports/openssl/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "openssl",
"version-string": "1.1.1m",
"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.",
"homepage": "https://www.openssl.org",
"dependencies": [

4
ports/openssl/windows/portfile.cmake
View File

@ -1,5 +1,3 @@
vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Desktop" ON_TARGET "UWP" "Linux" "OSX")
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
@ -16,7 +14,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OPENSSL_SHARED shared)
endif()
set(CONFIGURE_OPTIONS
set(CONFIGURE_OPTIONS
enable-static-engine
enable-capieng
no-ssl2

14
scripts/ci.baseline.txt
View File

@ -988,20 +988,6 @@ openni2:x64-uwp=fail
openni2:x64-windows-static=fail
openscap:x64-linux=fail
openscap:x64-osx=fail
openssl-unix:arm64-windows=fail
openssl-unix:arm-uwp=fail
openssl-unix:x64-uwp=fail
openssl-unix:x64-windows=fail
openssl-unix:x64-windows-static=fail
openssl-unix:x64-windows-static-md=fail
openssl-unix:x86-windows=fail
openssl-uwp:arm64-windows=fail
openssl-uwp:x64-linux=fail
openssl-uwp:x64-osx=fail
openssl-uwp:x64-windows=fail
openssl-uwp:x64-windows-static=fail
openssl-uwp:x64-windows-static-md=fail
openssl-uwp:x86-windows=fail
opentracing:arm-uwp=fail
opentracing:x64-uwp=fail
openvpn3:x64-osx=fail

2
versions/baseline.json
View File

@ -5054,7 +5054,7 @@
},
"openssl": {
"baseline": "1.1.1m",
"port-version": 0
"port-version": 1
},
"openssl-unix": {
"baseline": "1.1.1h",

5
versions/o-/openssl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9b8e2ac096b1cd8782137a853c5fc76e07c2af9a",
"version-string": "1.1.1m",
"port-version": 1
},
{
"git-tree": "1dbcaacad14ed0761323aa12c13e917270153594",
"version-string": "1.1.1m",