diff options
| author | Mark Schofield <mschofie@microsoft.com> | 2021-04-23 13:23:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-23 13:23:16 -0700 |
| commit | 9cdfdb60412d4c6c03478d5b1cda3150a04fd81a (patch) | |
| tree | bd2ec5b132c738542c7cce6d9e385ff0b6541e7c | |
| parent | cc64806c0bfee2658ef0042325fedf51e7026057 (diff) | |
| download | vcpkg-9cdfdb60412d4c6c03478d5b1cda3150a04fd81a.tar.gz vcpkg-9cdfdb60412d4c6c03478d5b1cda3150a04fd81a.zip | |
[openssl/unix] Run `make` with 'VCPKG_CONCURRENCY' parallelism (#17373)
| -rw-r--r-- | ports/openssl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openssl/unix/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/openssl/unix/portfile.cmake | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/o-/openssl.json | 5 |
5 files changed, 9 insertions, 3 deletions
diff --git a/ports/openssl/CONTROL b/ports/openssl/CONTROL index 8a26fb794..4fb53bb67 100644 --- a/ports/openssl/CONTROL +++ b/ports/openssl/CONTROL @@ -1,5 +1,5 @@ Source: openssl Version: 1.1.1j -Port-Version: 1 +Port-Version: 2 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 753534a30..f85f7b9f7 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -178,7 +178,7 @@ add_custom_command( add_custom_target(build_libs ALL
COMMAND ${ENV_COMMAND} "PATH=${MSYS_BIN_DIR}${PATH_VAR}"
COMMAND "${CMAKE_COMMAND}" -E touch "${BUILDDIR}/krb5.h"
- COMMAND "${MAKE}" build_libs
+ COMMAND "${MAKE}" -j ${VCPKG_CONCURRENCY} build_libs
VERBATIM
WORKING_DIRECTORY "${BUILDDIR}"
DEPENDS "${BUILDDIR}/Makefile"
diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 350cf4041..912234925 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} -DPERL=${PERL} -DMAKE=${MAKE} + -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY} OPTIONS_RELEASE -DINSTALL_HEADERS=ON ) diff --git a/versions/baseline.json b/versions/baseline.json index f9e99c002..9c6c40ef4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4522,7 +4522,7 @@ }, "openssl": { "baseline": "1.1.1j", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 9891f69cd..0e37bc8df 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "47f6dd2398634984759b609529bf35482957da54", + "version-string": "1.1.1j", + "port-version": 2 + }, + { "git-tree": "2695b5d292f012836d962b22293d4dc081f75bff", "version-string": "1.1.1j", "port-version": 1 |