From 9433136b22b5e443d550ca7665a562637c8a86b9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 27 Sep 2019 10:41:02 -0700 Subject: [boost] Update to 1.71.0 (#7959) * [boost] Update to 1.71.0 * [openmvs] Fixes for boost 1.71 * [telnetpp] DISABLE_PARALLEL_CONFIGURE * [execute_process] Fix output variables (like error_code) not getting populated * [telnetpp] Add missing boost-exception dependency * [boost] Refactor generate-ports.ps1 into scripts dir. Enable boost-thread on uwp. * [boost-iostreams] Revert removal of zstd dependency * [openmvs] Fix tools deployment --- ports/boost-python/CONTROL | 2 +- ports/boost-python/portfile.cmake | 5 ++--- ports/boost-python/unwind-type.patch | 31 ------------------------------- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 ports/boost-python/unwind-type.patch (limited to 'ports/boost-python') diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 2dc872ec0..23e407903 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-python -Version: 1.70.0-1 +Version: 1.71.0-1 Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 Homepage: https://github.com/boostorg/python Description: Boost python module diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 912926d61..30624f90d 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -5,10 +5,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.70.0 - SHA512 0e540f68713460c64f195f56af1cbd00ae4fa98adc91a83a0c1fdb7e60950cf282cab02b772f06e7c268c3cd294566d6abfa1d1aa545c687a256d6863870f72d + REF boost-1.71.0 + SHA512 0b78db2d0fda09298092cfbe7580d67db015aac7d5fac44c363dcc025f61d043fe4a87446b3f8f1fa76ae685838a98b0ed68609ecd945328f5fc4b12a493ee6a HEAD_REF master - PATCHES unwind-type.patch ) # Find Python. Can't use find_package here, but we already know where everything is diff --git a/ports/boost-python/unwind-type.patch b/ports/boost-python/unwind-type.patch deleted file mode 100644 index 62e9c8185..000000000 --- a/ports/boost-python/unwind-type.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/include/boost/python/detail/unwind_type.hpp b/include/boost/python/detail/unwind_type.hpp -index f6cdab6..da9633b 100644 ---- a/include/boost/python/detail/unwind_type.hpp -+++ b/include/boost/python/detail/unwind_type.hpp -@@ -11,7 +11,7 @@ - - namespace boost { namespace python { namespace detail { - --#ifndef _MSC_VER //if forward declared, msvc6.5 does not recognize them as inline -+#if !defined(_MSC_VER) || _MSC_VER >= 1915 //if forward declared, msvc6.5 does not recognize them as inline - // forward declaration, required (at least) by Tru64 cxx V6.5-042 - template - inline typename Generator::result_type -@@ -83,7 +83,7 @@ struct unwind_helper - - template - inline typename Generator::result_type --#ifndef _MSC_VER -+#if !defined(_MSC_VER) || _MSC_VER >= 1915 - unwind_type(U const& p, Generator*) - #else - unwind_type(U const& p, Generator* = 0) -@@ -148,7 +148,7 @@ struct unwind_helper2 - // why bother? - template - inline typename Generator::result_type --#ifndef _MSC_VER -+#if !defined(_MSC_VER) || _MSC_VER >= 1915 - unwind_type(boost::type*, Generator*) - #else - unwind_type(boost::type*p =0, Generator* =0) -- cgit v1.2.3 From 726c11148105a97aef39bec024fdb7c140b1b154 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Oct 2019 19:35:13 +0200 Subject: [vcpkg] fatal_error when patch fails to apply (#8087) vcpkg will now fail on failure to apply patches except when using `--head`. --- ports/boost-python/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/boost-python') diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 23e407903..132b5a800 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-python Version: 1.71.0-1 -Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 +Build-Depends: boost-bind, boost-compatibility, boost-config, boost-conversion, boost-core, boost-detail, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-mpl, boost-numeric-conversion, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-type-traits, boost-utility, boost-vcpkg-helpers, python3 (!osx&!linux) Homepage: https://github.com/boostorg/python Description: Boost python module -- cgit v1.2.3