From cf649980bc9cfff3d28b7bb452bd33fbc158d55c Mon Sep 17 00:00:00 2001 From: test Date: Sat, 19 May 2018 13:50:40 +0800 Subject: libgo update to v2.8 --- ports/libgo/CONTROL | 3 ++- ports/libgo/portfile.cmake | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL index 5764d77fb..51673711c 100644 --- a/ports/libgo/CONTROL +++ b/ports/libgo/CONTROL @@ -1,3 +1,4 @@ Source: libgo -Version: 2.7 +Version: 2.8 +Build-Depends: boost-context Description: The best stackful coroutine by c++11. diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 6807aabfb..01dabcb81 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yyzybb537/libgo - REF v2.7 - SHA512 eb83b87cf06464be8fc9632b69c14fd6e0612bedbf5b2e04c0a9c178d554ece85e3673b4e6076d7d8801d308d5975f6347662f2c2c4682cc8583b3096cced574 + REF v2.8 + SHA512 44784de4aec36ea321195c11c99a73de4f6f51285febdf6980e8aaced1fdfc0a34c6b1a8acc8c6b424e747310a1d7fb1604f722084c28ab91f8ebee15667d59b HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/cmake.patch ) @@ -31,6 +31,7 @@ vcpkg_configure_cmake( OPTIONS -DDISABLE_ADJUST_COMMAND_LINE_FLAGS=ON -DDISABLE_DYNAMIC_LIB=ON + -DENABLE_BOOST_CONTEXT=ON -DFORCE_UNIX_TARGETS=ON -DDISABLE_SYSTEMWIDE=ON ) -- cgit v1.2.3 From de8d4a3823f60522b980cefc48bcd27279b6ec28 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 23 May 2018 16:00:29 -0700 Subject: [libgo] Fix patch --- ports/libgo/cmake.patch | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ports/libgo/cmake.patch b/ports/libgo/cmake.patch index f6fd5fef8..bed9cddaa 100644 --- a/ports/libgo/cmake.patch +++ b/ports/libgo/cmake.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d291e4..0f6cc38 100644 +index dbbdd7d..29396a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -158,7 +158,7 @@ if (UNIX) +@@ -137,7 +137,7 @@ if (UNIX) set(CMAKE_CXX_FLAGS "-std=c++11 -fPIC -Wall -pthread ${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -pg ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS} -Werror") + set(CMAKE_CXX_FLAGS_DEBUG "-g -pg ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 ${CMAKE_CXX_FLAGS}") -else () +elseif (NOT DISABLE_ADJUST_COMMAND_LINE_FLAGS) if (NOT DISABLE_DYNAMIC_LIB) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") -@@ -180,7 +180,7 @@ set(STATIC_T "libgo_static") +@@ -159,7 +159,7 @@ set(STATIC_T "libgo_static") add_library("${STATIC_T}" STATIC ${CO_SRC_LIST}) set_target_properties("${STATIC_T}" PROPERTIES OUTPUT_NAME "${TARGET}") @@ -20,7 +20,7 @@ index 0d291e4..0f6cc38 100644 add_subdirectory(${PROJECT_SOURCE_DIR}/libgo/main) if (NOT DISABLE_DYNAMIC_LIB) -@@ -201,9 +201,15 @@ if (UNIX) +@@ -180,7 +180,11 @@ if (UNIX) PATTERN "ctx_boost_coroutine" EXCLUDE PATTERN "ctx_ucontext" EXCLUDE PATTERN "*.h") @@ -29,10 +29,6 @@ index 0d291e4..0f6cc38 100644 + else() + install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/windows/ DESTINATION "include/libgo" FILES_MATCHING PATTERN "*.h") + endif() -+ if(NOT DISABLE_SYSTEMWIDE) - file(WRITE ${PROJECT_SOURCE_DIR}/tools/libgo.conf "${CMAKE_INSTALL_PREFIX}/lib") - install(FILES ${PROJECT_SOURCE_DIR}/tools/libgo.conf DESTINATION "/etc/ld.so.conf.d") -+ endif() + #file(WRITE ${PROJECT_SOURCE_DIR}/tools/libgo.conf "${CMAKE_INSTALL_PREFIX}/lib") + #install(FILES ${PROJECT_SOURCE_DIR}/tools/libgo.conf DESTINATION "/etc/ld.so.conf.d") if (DEPEND_BOOST) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/ctx_boost_coroutine/ DESTINATION "include/libgo/ctx_boost_coroutine" FILES_MATCHING PATTERN "*.h") - install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/ctx_boost_context/ DESTINATION "include/libgo/ctx_boost_context" FILES_MATCHING PATTERN "*.h") -- cgit v1.2.3 From 1f00e2fc6798a4b9748204f34204797b0684794e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 23 May 2018 16:45:10 -0700 Subject: [libgo] Bump version --- ports/libgo/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL index 51673711c..c5c06fd8b 100644 --- a/ports/libgo/CONTROL +++ b/ports/libgo/CONTROL @@ -1,4 +1,4 @@ Source: libgo -Version: 2.8 +Version: 2.8-1 Build-Depends: boost-context Description: The best stackful coroutine by c++11. -- cgit v1.2.3