aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2018-08-29 16:21:53 -0700
committerGitHub <noreply@github.com>2018-08-29 16:21:53 -0700
commitd91d55a3c31d6364cb8a50e44c50315ac73aed85 (patch)
tree1a60c6a3f13f592a90ae629181ef3a212dfb927c
parentf8fd9c15ef10632c90245ae5cc8cbbcee8708d15 (diff)
parent8707035fc79ad1a9d607f963f4839f3ff9c22b84 (diff)
downloadvcpkg-d91d55a3c31d6364cb8a50e44c50315ac73aed85.tar.gz
vcpkg-d91d55a3c31d6364cb8a50e44c50315ac73aed85.zip
Merge pull request #4186 from xiangfan-ms/master
Update boost-hana-msvc to use the official develop branch of boost.hana.
-rw-r--r--ports/boost-hana-msvc/portfile.cmake8
-rw-r--r--ports/boost-hana/CONTROL2
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/boost-hana-msvc/portfile.cmake b/ports/boost-hana-msvc/portfile.cmake
index c56926499..a736e9324 100644
--- a/ports/boost-hana-msvc/portfile.cmake
+++ b/ports/boost-hana-msvc/portfile.cmake
@@ -2,10 +2,10 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- REPO xiangfan-ms/hana
- REF caa985795ab6c4b2c7bcf1458ccbb6ded65c15cb
- SHA512 7ed65bda17042c42f7a76d88e66df61155800066119f6b256e20cf04dcd18d46584d3e44ad6555e9a17d9c0bf85fbf173ae6079f5a4a878341f959c855ebee6b
- HEAD_REF master
+ REPO boostorg/hana
+ REF 7f1ae3b1bb52f6eb329300a93dc02309c94dfe01
+ SHA512 5fe1962ae270901b58eec83750edd02cc7192b4fae4add72849efbb9989dd5f9a0e3a85f3e3a7525fce38e6ef5bca210993b89d04a1c39bd0421bd0a6f4c92cb
+ HEAD_REF develop
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
diff --git a/ports/boost-hana/CONTROL b/ports/boost-hana/CONTROL
index 4d1e9a909..df3af582a 100644
--- a/ports/boost-hana/CONTROL
+++ b/ports/boost-hana/CONTROL
@@ -1,5 +1,5 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 but has edits
Source: boost-hana
-Version: 1.68.0
+Version: 1.68.0-1
Build-Depends: boost-config, boost-core, boost-fusion, boost-mpl, boost-tuple, boost-vcpkg-helpers, boost-hana-msvc (windows), boost-hana-msvc (uwp)
Description: Boost hana module