3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-30 20:59:12 +08:00
Code Issues Projects Releases Wiki Activity

[openssl] Fix error in msys call to perform the perl installation.

Browse Source
This commit is contained in:
Robert Schumacher 2017-08-01 16:03:40 -07:00
parent 5e9ac8a25b
commit 9a87ee9c9d
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/openssl/portfile-uwp.cmake
View File

@ -29,9 +29,20 @@ include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT)
vcpkg_find_acquire_program(PERL)
vcpkg_find_acquire_program(JOM) vcpkg_find_acquire_program(JOM)
get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY)
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(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}")

2
ports/openssl/portfile.cmake
View File

@ -14,7 +14,7 @@ vcpkg_acquire_msys(MSYS_ROOT)
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
vcpkg_execute_required_process( vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc -c "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl" COMMAND ${BASH} --noprofile --norc -c 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed perl'
WORKING_DIRECTORY ${MSYS_ROOT} WORKING_DIRECTORY ${MSYS_ROOT}
LOGNAME pacman-${TARGET_TRIPLET} LOGNAME pacman-${TARGET_TRIPLET}
) )

2
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -32,7 +32,7 @@
## vcpkg_execute_required_process( ## vcpkg_execute_required_process(
## COMMAND ## COMMAND
## ${BASH} --noprofile --norc -c ## ${BASH} --noprofile --norc -c
## "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed make" ## 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed make'
## WORKING_DIRECTORY ${MSYS_ROOT} ## WORKING_DIRECTORY ${MSYS_ROOT}
## LOGNAME pacman-${TARGET_TRIPLET}) ## LOGNAME pacman-${TARGET_TRIPLET})
## ``` ## ```