aboutsummaryrefslogtreecommitdiff
path: root/ports/tbb
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2018-12-04 14:05:12 -0800
committerPhil Christensen <philc@microsoft.com>2018-12-04 14:05:12 -0800
commite712374b2831c4d04fc3b37373ed5cf041a3713e (patch)
tree3c1be3898e52d0e01cfc842be7ea553e8fe0bafb /ports/tbb
parent7f80cbdeb02a126a610f3a3262eaefa9c9f9b938 (diff)
parentf6d32cc644a6f0fb9adb1bb3c3fd4905e8d61e2e (diff)
downloadvcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.tar.gz
vcpkg-e712374b2831c4d04fc3b37373ed5cf041a3713e.zip
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4889
Diffstat (limited to 'ports/tbb')
-rw-r--r--ports/tbb/CONTROL2
-rw-r--r--ports/tbb/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL
index e87106dc3..8aa6dee78 100644
--- a/ports/tbb/CONTROL
+++ b/ports/tbb/CONTROL
@@ -1,3 +1,3 @@
Source: tbb
-Version: 2018_U5-4
+Version: 2018_U6
Description: Intel's Threading Building Blocks.
diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake
index ac47360f8..a4e912742 100644
--- a/ports/tbb/portfile.cmake
+++ b/ports/tbb/portfile.cmake
@@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 01org/tbb
- REF 2018_U5
- SHA512 3e8d20276ccb1b50099f96b6cf968e3d0ada53caea1fa836ecb8652f1dca236fbbbf2c783e64ea2f761f7f21725064d19b72d176e35e4dc29706b8a30965153b
+ REF 2018_U6
+ SHA512 efcd020a24fa41e07ff9232098cecce42ceec5882849bc30edc29ead1694fcc8820a0defb307e0a065c1db1d649a731e13d8cb6fd6f927b4bd3bdc46de0d1709
HEAD_REF tbb_2018
)