diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-31 11:27:22 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-07-31 11:27:22 -0700 |
| commit | c22ab980bcab362134ef3e5db329a81c1767c2c9 (patch) | |
| tree | 0dc07047ca99a65799d86b07a9fad482adfc4986 | |
| parent | 25ece10e9855e1033a20375a0858ef1d8e981182 (diff) | |
| download | vcpkg-c22ab980bcab362134ef3e5db329a81c1767c2c9.tar.gz vcpkg-c22ab980bcab362134ef3e5db329a81c1767c2c9.zip | |
[openssl] Switch to msys2 as a perl provider due to strawberryperl being down.
| -rw-r--r-- | ports/openssl/portfile.cmake | 14 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 0dfd9aa88..45417e4eb 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -7,14 +7,24 @@ include(vcpkg_common_functions) set(OPENSSL_VERSION 1.0.2l) set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION}) -vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(NASM) find_program(NMAKE nmake) +vcpkg_acquire_msys(MSYS_ROOT) +set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + +vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl" + WORKING_DIRECTORY ${MSYS_ROOT} + LOGNAME pacman-${TARGET_TRIPLET} +) + +set(PERL ${MSYS_ROOT}/usr/bin/perl.exe) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) vcpkg_find_acquire_program(JOM) -set(ENV{PATH} "${PERL_EXE_PATH};${NASM_EXE_PATH};$ENV{PATH}") +set(ENV{PATH} "${NASM_EXE_PATH};$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz" diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index d87ec3e7c..905952eab 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -32,7 +32,7 @@ ## vcpkg_execute_required_process( ## COMMAND ## ${BASH} --noprofile --norc -c -## "pacman -Sy --noconfirm --needed make" +## "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed make" ## WORKING_DIRECTORY ${MSYS_ROOT} ## LOGNAME pacman-${TARGET_TRIPLET}) ## ``` |