diff options
| author | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
|---|---|---|
| committer | Nicole Mazzuca <t-nimaz@microsoft.com> | 2019-07-19 12:17:22 -0700 |
| commit | b3caf67749f21952e0157ba77ece755aa01b254a (patch) | |
| tree | dff6a178b506fdc58e28bbc9094f1687eb99bd72 /ports/bond | |
| parent | fddebb75da034752fb267ba121497ba58157bb79 (diff) | |
| parent | 618fa203c13c30bd19826988cff66481bca0562f (diff) | |
| download | vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.tar.gz vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.zip | |
Merge branch 'trunk' into parallel-file-ops
Diffstat (limited to 'ports/bond')
| -rw-r--r-- | ports/bond/CONTROL | 12 | ||||
| -rw-r--r-- | ports/bond/portfile.cmake | 21 |
2 files changed, 11 insertions, 22 deletions
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL index 0d1b82bc3..6e5daf0a9 100644 --- a/ports/bond/CONTROL +++ b/ports/bond/CONTROL @@ -1,6 +1,6 @@ -Source: bond
-Maintainer: bond@microsoft.com
-Version: 8.1.0
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
-Homepage: https://github.com/Microsoft/bond
-Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
+Source: bond +Maintainer: bond@microsoft.com +Version: 8.1.0-2 +Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. +Homepage: https://github.com/Microsoft/bond +Build-Depends: rapidjson, boost-config, boost-utility, boost-assign diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 42755dbf9..921b1b8cc 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -29,22 +29,11 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR endif() else() - message(STATUS "Installing stack...") - vcpkg_download_distfile( - ARCHIVE - URLS "https://get.haskellstack.org/" - FILENAME "stack-install.sh" - SHA512 6db2008297416ad856aa498908bf695737cf3cc466440397720a458358e9661d07abdba762662080ee8bbd8171cdcb05eec6d3696382575c099adfb8427e05fd - ) - - set(BASH /bin/bash) - - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc "${ARCHIVE}" -f - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME install-stack - ) - + # According to the readme on https://github.com/microsoft/bond/ + # The build needs a version of the Haskel Tool stack that is newer than some distros ship with. + # For this reason the message is not guarded by checking to see if the tool is installed. + message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n") + endif() vcpkg_configure_cmake( |