diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-05-06 23:00:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 14:00:37 -0700 |
| commit | d66dae4134d9a55f9f84d9cf1b8fa225ca35c68d (patch) | |
| tree | 3c1db325fff22f16e3539bfc4980e289fdb8e883 | |
| parent | 2a4749e8ad2b278958909e14dced0638b049bf60 (diff) | |
| download | vcpkg-d66dae4134d9a55f9f84d9cf1b8fa225ca35c68d.tar.gz vcpkg-d66dae4134d9a55f9f84d9cf1b8fa225ca35c68d.zip | |
[Openssl] Fix mingw build (#17456)
* Use 'MINGW' when in CMake project mode
* Bump port-version, format manifest
* x-add-version
| -rw-r--r-- | ports/openssl/CONTROL | 4 | ||||
| -rw-r--r-- | ports/openssl/unix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/openssl/vcpkg.json | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
5 files changed, 14 insertions, 6 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL deleted file mode 100644 index 303b7d910..000000000 --- a/ports/openssl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: openssl -Version: 1.1.1k -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. diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index f85f7b9f7..d5fe3e1f4 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -106,7 +106,7 @@ if(BUILD_SHARED_LIBS) if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
set(LIB_EXT dylib)
set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT})
- elseif(VCPKG_TARGET_IS_MINGW)
+ elseif(MINGW)
string(REPLACE "." "_" SHLIB_VERSION "${SHLIB_VERSION}")
set(BIN_EXT dll)
set(LIB_EXT dll.a)
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json new file mode 100644 index 000000000..612b38a05 --- /dev/null +++ b/ports/openssl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "openssl", + "version-string": "1.1.1k", + "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" +} diff --git a/versions/baseline.json b/versions/baseline.json index fecdf876c..1783b2f6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4542,7 +4542,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 600c1724a..c0771f1a5 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "24a9f866c10144f3dcce1b8972d43170cfad3201", + "version-string": "1.1.1k", + "port-version": 1 + }, + { "git-tree": "dc279487c79f2b009333d7888799f3f9f83d8765", "version-string": "1.1.1k", "port-version": 0 |