aboutsummaryrefslogtreecommitdiff
path: root/ports/botan
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-06-21 04:11:54 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-06-20 19:11:54 -0700
commit47d206e149e88201333b5ca8fe55c30e2b1a8177 (patch)
treec0620a39116333a6cb6ffc092983ba7114c6daf2 /ports/botan
parente16efa4d6aa6f36247eb6dfd646fdf81af0c36e0 (diff)
downloadvcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.tar.gz
vcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.zip
[many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
Diffstat (limited to 'ports/botan')
-rw-r--r--ports/botan/CONTROL4
-rw-r--r--ports/botan/portfile.cmake31
2 files changed, 9 insertions, 26 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL
index 8ceb0118c..9221e7f66 100644
--- a/ports/botan/CONTROL
+++ b/ports/botan/CONTROL
@@ -1,4 +1,4 @@
Source: botan
-Version: 2.9.0
+Version: 2.9.0-1
Homepage: https://botan.randombit.net
-Description: A cryptography library written in C++11 \ No newline at end of file
+Description: A cryptography library written in C++11
diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake
index 8b9a200d4..4dc02d588 100644
--- a/ports/botan/portfile.cmake
+++ b/ports/botan/portfile.cmake
@@ -10,32 +10,14 @@ vcpkg_from_github(
HEAD_REF master
)
-set(NUMBER_OF_PROCESSORS "1")
-if(DEFINED ENV{NUMBER_OF_PROCESSORS})
- set(NUMBER_OF_PROCESSORS $ENV{NUMBER_OF_PROCESSORS})
-else()
- if(APPLE)
- set(job_count_command sysctl -n hw.physicalcpu)
- else()
- set(job_count_command nproc)
- endif()
- execute_process(
- COMMAND ${job_count_command}
- OUTPUT_VARIABLE NUMBER_OF_PROCESSORS
- )
- string(REPLACE "\n" "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
- string(REPLACE " " "" NUMBER_OF_PROCESSORS "${NUMBER_OF_PROCESSORS}")
- if(NOT NUMBER_OF_PROCESSORS)
- set(NUMBER_OF_PROCESSORS "1")
- endif()
-endif()
-
if(CMAKE_HOST_WIN32)
vcpkg_find_acquire_program(JOM)
- set(build_tool "${JOM}" /J ${NUMBER_OF_PROCESSORS})
+ set(build_tool "${JOM}")
+ set(parallel_build "/J ${VCPKG_CONCURRENCY}")
else()
find_program(MAKE make)
- set(build_tool "${MAKE}" -j${NUMBER_OF_PROCESSORS})
+ set(build_tool "${MAKE}")
+ set(parallel_build "-j${VCPKG_CONCURRENCY}")
endif()
vcpkg_find_acquire_program(PYTHON3)
@@ -93,7 +75,7 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
--link-method=copy)
if(CMAKE_HOST_WIN32)
list(APPEND configure_arguments ${BOTAN_MSVC_RUNTIME}${BOTAN_MSVC_RUNTIME_SUFFIX})
- endif()
+ endif()
vcpkg_execute_required_process(
COMMAND "${PYTHON3}" "${SOURCE_PATH}/configure.py" ${configure_arguments}
@@ -102,8 +84,9 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
message(STATUS "Configure ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}")
- vcpkg_execute_required_process(
+ vcpkg_execute_build_process(
COMMAND ${build_tool}
+ NO_PARALLEL_COMMAND "${build_tool} ${parallel_build}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}"
LOGNAME build-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE})
message(STATUS "Build ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")