diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-08-27 12:27:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 12:27:39 -0700 |
| commit | 8054263f15c8400d6df5fff55fae97394e187368 (patch) | |
| tree | a5cc0464457d382ca6f4c9b6e6f7c280408f1101 /ports | |
| parent | 99212d675f12c38b80ee6c38074e39cd9777339e (diff) | |
| download | vcpkg-8054263f15c8400d6df5fff55fae97394e187368.tar.gz vcpkg-8054263f15c8400d6df5fff55fae97394e187368.zip | |
[skia, ompl, capnproto] Update VMs for 2020-08-12 (including VS 16.7) (#12884)
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/llvm/0004-fix-dr-1734.patch | 14 | ||||
| -rw-r--r-- | ports/llvm/CONTROL | 3 | ||||
| -rw-r--r-- | ports/llvm/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/skia/CONTROL | 2 | ||||
| -rw-r--r-- | ports/skia/add-missing-tuple.patch | 12 | ||||
| -rw-r--r-- | ports/skia/portfile.cmake | 5 |
6 files changed, 35 insertions, 2 deletions
diff --git a/ports/llvm/0004-fix-dr-1734.patch b/ports/llvm/0004-fix-dr-1734.patch new file mode 100644 index 000000000..adfbe5a13 --- /dev/null +++ b/ports/llvm/0004-fix-dr-1734.patch @@ -0,0 +1,14 @@ +diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h +index b7d48e8e1ad..53ba24efc00 100644 +--- a/llvm/include/llvm/Support/type_traits.h ++++ b/llvm/include/llvm/Support/type_traits.h +@@ -177,7 +177,8 @@ class is_trivially_copyable { + (has_deleted_copy_assign || has_trivial_copy_assign) && + (has_deleted_copy_constructor || has_trivial_copy_constructor); + +-#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE ++ // due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable ++#if 0 + static_assert(value == std::is_trivially_copyable<T>::value, + "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); + #endif diff --git a/ports/llvm/CONTROL b/ports/llvm/CONTROL index 3c2571379..f461f1cb5 100644 --- a/ports/llvm/CONTROL +++ b/ports/llvm/CONTROL @@ -1,5 +1,6 @@ Source: llvm -Version: 10.0.0-4 +Version: 10.0.0 +Port-Version: 5 Homepage: https://llvm.org/ Description: The LLVM Compiler Infrastructure Supports: !uwp diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 9351047e6..305e6bf78 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0001-allow-to-use-commas.patch 0002-fix-install-paths.patch 0003-fix-vs2019-v16.6.patch + 0004-fix-dr-1734.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/skia/CONTROL b/ports/skia/CONTROL index 6b6677ab9..917ca1199 100644 --- a/ports/skia/CONTROL +++ b/ports/skia/CONTROL @@ -1,6 +1,6 @@ Source: skia Version: 2020-05-18 -Port-Version: 2 +Port-Version: 3 Homepage: https://skia.org Description: Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products. diff --git a/ports/skia/add-missing-tuple.patch b/ports/skia/add-missing-tuple.patch new file mode 100644 index 000000000..e33d44e3a --- /dev/null +++ b/ports/skia/add-missing-tuple.patch @@ -0,0 +1,12 @@ +diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h
+index 7afe4f9..502f83e 100644
+--- a/include/private/SkPathRef.h
++++ b/include/private/SkPathRef.h
+@@ -21,6 +21,7 @@
+
+ #include <atomic>
+ #include <limits>
++#include <tuple>
+
+ class SkRBuffer;
+ class SkWBuffer;
diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index cdd7254ca..b7cc1f093 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -163,6 +163,11 @@ if(CMAKE_HOST_WIN32) endif() +vcpkg_apply_patches( + SOURCE_PATH "${SOURCE_PATH}" + PATCHES add-missing-tuple.patch +) + vcpkg_configure_gn( SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG "${OPTIONS_DBG}" |