diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-15 13:56:20 -0700 |
| commit | 28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7 (patch) | |
| tree | a7952616386d4fa19ee9f44aff204e27de85f249 /ports/openssl | |
| parent | 957cb214e92f45069f142d8b6ccf2a6425df9c51 (diff) | |
| parent | cd7f4cccffd915edc2d4b625ff32dea970ec073f (diff) | |
| download | vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.tar.gz vcpkg-28ae8e94d5ba7c285dde6b8820b3bd56f5f775f7.zip | |
Merge branch 'master' into qualifier_change
Diffstat (limited to 'ports/openssl')
| -rw-r--r-- | ports/openssl/portfile.cmake | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 45417e4eb..569de6c75 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -7,20 +7,10 @@ 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) @@ -65,11 +55,11 @@ endif() file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) -message(STATUS "Build ${TARGET_TRIPLET}-rel") file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION}) set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) +message(STATUS "Configure ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} @@ -80,6 +70,9 @@ vcpkg_execute_required_process( WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel ) +message(STATUS "Configure ${TARGET_TRIPLET}-rel done") + +message(STATUS "Build ${TARGET_TRIPLET}-rel") # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) @@ -97,7 +90,7 @@ vcpkg_execute_required_process( message(STATUS "Build ${TARGET_TRIPLET}-rel done") -message(STATUS "Build ${TARGET_TRIPLET}-dbg") +message(STATUS "Configure ${TARGET_TRIPLET}-dbg") file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/openssl-${OPENSSL_VERSION}) set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) @@ -112,6 +105,9 @@ vcpkg_execute_required_process( WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg ) +message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") + +message(STATUS "Build ${TARGET_TRIPLET}-dbg") make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl) execute_process( COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE} |