aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorMark Schofield <mschofie@microsoft.com>2021-04-23 13:23:16 -0700
committerGitHub <noreply@github.com>2021-04-23 13:23:16 -0700
commit9cdfdb60412d4c6c03478d5b1cda3150a04fd81a (patch)
treebd2ec5b132c738542c7cce6d9e385ff0b6541e7c /ports
parentcc64806c0bfee2658ef0042325fedf51e7026057 (diff)
downloadvcpkg-9cdfdb60412d4c6c03478d5b1cda3150a04fd81a.tar.gz
vcpkg-9cdfdb60412d4c6c03478d5b1cda3150a04fd81a.zip
[openssl/unix] Run `make` with 'VCPKG_CONCURRENCY' parallelism (#17373)
Diffstat (limited to 'ports')
-rw-r--r--ports/openssl/CONTROL2
-rw-r--r--ports/openssl/unix/CMakeLists.txt2
-rw-r--r--ports/openssl/unix/portfile.cmake1
3 files changed, 3 insertions, 2 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
)