diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-08-15 09:30:44 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-20 14:26:47 -0700 |
| commit | b9012863292f1e4b431d1f02a3bbc1457c17690d (patch) | |
| tree | 5a9920b92742da57785105b76be57c2de2eb27d5 | |
| parent | eae02c95b33ec0272a232395820379e0a8b2393d (diff) | |
| download | vcpkg-b9012863292f1e4b431d1f02a3bbc1457c17690d.tar.gz vcpkg-b9012863292f1e4b431d1f02a3bbc1457c17690d.zip | |
[libgo] Fix boost-1.68
| -rw-r--r-- | ports/libgo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgo/boost-168.patch | 20 | ||||
| -rw-r--r-- | ports/libgo/portfile.cmake | 9 |
3 files changed, 25 insertions, 6 deletions
diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL index c5c06fd8b..18b37915a 100644 --- a/ports/libgo/CONTROL +++ b/ports/libgo/CONTROL @@ -1,4 +1,4 @@ Source: libgo -Version: 2.8-1 +Version: 2.8-2 Build-Depends: boost-context Description: The best stackful coroutine by c++11. diff --git a/ports/libgo/boost-168.patch b/ports/libgo/boost-168.patch new file mode 100644 index 000000000..48a90023f --- /dev/null +++ b/ports/libgo/boost-168.patch @@ -0,0 +1,20 @@ +diff --git a/libgo/ctx_boost_context/context.h b/libgo/ctx_boost_context/context.h
+index 2db71c0..2f321fb 100644
+--- a/libgo/ctx_boost_context/context.h
++++ b/libgo/ctx_boost_context/context.h
+@@ -1,4 +1,4 @@
+-#include <boost/context/all.hpp>
++#include <boost/context/execution_context.hpp>
+
+ #if BOOST_EXECUTION_CONTEXT == 2 // boost version >= 1.61
+ # include "context_v2.h"
+diff --git a/libgo/ctx_boost_context/context_v2.h b/libgo/ctx_boost_context/context_v2.h
+index e415af4..59e2e29 100644
+--- a/libgo/ctx_boost_context/context_v2.h
++++ b/libgo/ctx_boost_context/context_v2.h
+@@ -1,4 +1,4 @@
+-#include <boost/context/all.hpp>
++#include <boost/context/stack_context.hpp>
+
+ namespace co
+ {
diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 01dabcb81..f0311eea4 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -1,9 +1,6 @@ include(vcpkg_common_functions) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - message("libgo currently only supports static linkage") - set(VCPKG_LIBRARY_LINKAGE static) -endif() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -11,7 +8,9 @@ vcpkg_from_github( REF v2.8 SHA512 44784de4aec36ea321195c11c99a73de4f6f51285febdf6980e8aaced1fdfc0a34c6b1a8acc8c6b424e747310a1d7fb1604f722084c28ab91f8ebee15667d59b HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch + PATCHES + cmake.patch + boost-168.patch ) vcpkg_download_distfile(ARCHIVE |