diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/pybind11 | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/pybind11')
| -rw-r--r-- | ports/pybind11/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pybind11/aliastemplates.patch | 45 | ||||
| -rw-r--r-- | ports/pybind11/portfile.cmake | 2 |
3 files changed, 1 insertions, 48 deletions
diff --git a/ports/pybind11/CONTROL b/ports/pybind11/CONTROL index acaedef63..4b2ae8ca7 100644 --- a/ports/pybind11/CONTROL +++ b/ports/pybind11/CONTROL @@ -1,5 +1,5 @@ Source: pybind11 -Version: 2.3.0 +Version: 2.3.0-1 Homepage: https://github.com/pybind/pybind11 Description: pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. Build-Depends: python3 (windows)
\ No newline at end of file diff --git a/ports/pybind11/aliastemplates.patch b/ports/pybind11/aliastemplates.patch deleted file mode 100644 index a692ad583..000000000 --- a/ports/pybind11/aliastemplates.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 598ec67e4d6727dd9455bcc9959e32fee02a80ac Mon Sep 17 00:00:00 2001 -From: Michael Goulding <Michael.Goulding@microsoft.com> -Date: Wed, 18 Jul 2018 10:59:15 -0700 -Subject: [PATCH 1/2] VS 15.8.0 Preview 4.0 has a bug with alias templates - ---- - include/pybind11/detail/common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h -index 3c6722891..89d922190 100644 ---- a/include/pybind11/detail/common.h -+++ b/include/pybind11/detail/common.h -@@ -476,7 +476,7 @@ template <typename...> struct void_t_impl { using type = void; }; - template <typename... Ts> using void_t = typename void_t_impl<Ts...>::type; - - /// Compile-time all/any/none of that check the boolean value of all template types --#ifdef __cpp_fold_expressions -+#if (!defined(_MSC_VER) || ( _MSC_VER >= 1916 )) && defined(__cpp_fold_expressions) - template <class... Ts> using all_of = bool_constant<(Ts::value && ...)>; - template <class... Ts> using any_of = bool_constant<(Ts::value || ...)>; - #elif !defined(_MSC_VER) - -From 7d534251ca67c5e725ed549900f04adeb5ddb99e Mon Sep 17 00:00:00 2001 -From: Michael Goulding <Michael.Goulding@microsoft.com> -Date: Thu, 19 Jul 2018 10:27:41 -0700 -Subject: [PATCH 2/2] Address feedback - ---- - include/pybind11/detail/common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/pybind11/detail/common.h b/include/pybind11/detail/common.h -index 89d922190..8d65b260d 100644 ---- a/include/pybind11/detail/common.h -+++ b/include/pybind11/detail/common.h -@@ -476,7 +476,7 @@ template <typename...> struct void_t_impl { using type = void; }; - template <typename... Ts> using void_t = typename void_t_impl<Ts...>::type; - - /// Compile-time all/any/none of that check the boolean value of all template types --#if (!defined(_MSC_VER) || ( _MSC_VER >= 1916 )) && defined(__cpp_fold_expressions) -+#if defined(__cpp_fold_expressions) && !(defined(_MSC_VER) && (_MSC_VER < 1916)) - template <class... Ts> using all_of = bool_constant<(Ts::value && ...)>; - template <class... Ts> using any_of = bool_constant<(Ts::value || ...)>; - #elif !defined(_MSC_VER) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 71786016d..e97841d32 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_from_github( REF e43e1cc01ae6d4e4e5ba10557a057d7f3d5ece0d SHA512 546a0501c420cbbb21fb458192bae6c8d34bdd4bdbfe47fed22869e09429d6404b4e399e30c36c6d658bf8002339d051efde33685b03a00797b9cfe476cfb98e HEAD_REF master - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/aliastemplates.patch ) vcpkg_find_acquire_program(PYTHON3) |