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