[openssl] Switch to msys2 as a perl provider due to strawberryperl being down.

This commit is contained in:
Robert Schumacher 2017-07-31 11:27:22 -07:00
parent 25ece10e98
commit c22ab980bc
2 changed files with 13 additions and 3 deletions

View File

@ -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"

View File

@ -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})
## ```