From 28abc94084b450de58c278d9654b13fd5ec49eec Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 16 Aug 2018 11:23:15 -0700 Subject: [boost-python] Apply fix for MSVC /permissive- --- ports/boost-python/CONTROL | 2 +- ports/boost-python/portfile.cmake | 1 + ports/boost-python/unwind-type.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create 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 36bb42387..318dade7d 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-python -Version: 1.67.0-1 +Version: 1.67.0-2 Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3 Description: Boost python module diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 73980e640..06b2efa14 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF boost-1.67.0 SHA512 59091af63626cc6e33f76bded8733b5fb044f7139197e6c887e8e279831954c1e8b67341b6b2f3c9dce97e67a166996321ea439609d225dab7f68762423d6211 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 new file mode 100644 index 000000000..62e9c8185 --- /dev/null +++ b/ports/boost-python/unwind-type.patch @@ -0,0 +1,31 @@ +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 eae02c95b33ec0272a232395820379e0a8b2393d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 9 Aug 2018 22:56:09 -0700 Subject: [boost] Update to 1.68.0 [boost-vcpkg-helpers] Improve include scanner [boost-vcpkg-helpers] Fix boost/functional/hash -> boost/container_hash dependency [boost-context] Install replacement boost/context/all.hpp to support FindBoost.cmake [boost] Improve port dependency qualifiers for UWP [boost-contract] Mark as known to fail for ARM --- ports/boost-python/CONTROL | 4 ++-- ports/boost-python/portfile.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ports/boost-python') diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 318dade7d..31bd01788 100644 --- a/ports/boost-python/CONTROL +++ b/ports/boost-python/CONTROL @@ -1,5 +1,5 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1 Source: boost-python -Version: 1.67.0-2 -Build-Depends: boost-bind, boost-config, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3 +Version: 1.68.0-2 +Build-Depends: boost-bind, boost-config, boost-conversion, boost-core, boost-detail, boost-graph, boost-integer, boost-iterator, boost-mpl, boost-preprocessor, boost-property-map, boost-smart-ptr, boost-static-assert, boost-tuple, boost-utility, boost-vcpkg-helpers, python3 Description: Boost python module diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 06b2efa14..bdbe49f25 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -5,8 +5,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.67.0 - SHA512 59091af63626cc6e33f76bded8733b5fb044f7139197e6c887e8e279831954c1e8b67341b6b2f3c9dce97e67a166996321ea439609d225dab7f68762423d6211 + REF boost-1.68.0 + SHA512 17aacec09a653b718e1925f13fbce1a22a09d44011534e451a953600f4fef47b0e8a759d4e1588b74dbfc71ef38f1f13200d77668eca2ad1bc5b1e470e231a2f HEAD_REF master PATCHES unwind-type.patch ) -- cgit v1.2.3