diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-07-17 11:12:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 11:12:47 -0700 |
| commit | 9a935a66dcd8ff70be548f5c1006b04626af0167 (patch) | |
| tree | 872fd3d7089c049366587c2647e3620df2e2ec76 | |
| parent | 8e17f07f4446c7d3d2bc5a212d77147674c63f97 (diff) | |
| download | vcpkg-9a935a66dcd8ff70be548f5c1006b04626af0167.tar.gz vcpkg-9a935a66dcd8ff70be548f5c1006b04626af0167.zip | |
[bond] make haskell an external dependency (#7306)
| -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 8e8aca70a..6e5daf0a9 100644 --- a/ports/bond/CONTROL +++ b/ports/bond/CONTROL @@ -1,6 +1,6 @@ -Source: bond
-Maintainer: bond@microsoft.com
-Version: 8.1.0-1
-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 a1a965a60..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 35a953d626d81bebef33d84cfeb54028b315f6e2802fc50739ed8c5731944bcbefea6284e482f898b27bbed421dbf3e43f284998620091a16d8eed825ebcda37 - ) - - 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( |