From b9012863292f1e4b431d1f02a3bbc1457c17690d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 15 Aug 2018 09:30:44 -0700 Subject: [PATCH] [libgo] Fix boost-1.68 --- ports/libgo/CONTROL | 2 +- ports/libgo/boost-168.patch | 20 ++++++++++++++++++++ ports/libgo/portfile.cmake | 9 ++++----- 3 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/libgo/boost-168.patch diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL index c5c06fd8b1..18b37915ae 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 0000000000..48a90023fd --- /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 ++#include + + #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 ++#include + + namespace co + { diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 01dabcb81d..f0311eea40 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