diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/boost-python | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/boost-python')
| -rw-r--r-- | ports/boost-python/CONTROL | 4 | ||||
| -rw-r--r-- | ports/boost-python/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/boost-python/unwind-type.patch | 31 |
3 files changed, 36 insertions, 4 deletions
diff --git a/ports/boost-python/CONTROL b/ports/boost-python/CONTROL index 36bb42387..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-1
-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 73980e640..bdbe49f25 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -5,9 +5,10 @@ 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
)
# 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 <class Generator, class U>
+ inline typename Generator::result_type
+@@ -83,7 +83,7 @@ struct unwind_helper<false>
+
+ template <class Generator, class U>
+ 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<reference_to_pointer_>
+ // why bother?
+ template <class Generator, class U>
+ inline typename Generator::result_type
+-#ifndef _MSC_VER
++#if !defined(_MSC_VER) || _MSC_VER >= 1915
+ unwind_type(boost::type<U>*, Generator*)
+ #else
+ unwind_type(boost::type<U>*p =0, Generator* =0)
|