From 1b1d1b209d45cf3df696f9040fb099a80bec0d84 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 23 Jul 2021 04:37:49 +0800 Subject: [libgo] Add DISABLE_PARALLEL_CONFIGURE (#19037) * [libgo] Add DISABLE_PARALLEL_CONFIGURE * update version files * Update deprecated functions * Update versions/l-/libgo.json --- ports/libgo/CONTROL | 5 ----- ports/libgo/portfile.cmake | 30 +++++++++++++++--------------- ports/libgo/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libgo.json | 5 +++++ 5 files changed, 36 insertions(+), 22 deletions(-) delete mode 100644 ports/libgo/CONTROL create mode 100644 ports/libgo/vcpkg.json diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL deleted file mode 100644 index 92d6f9f5a..000000000 --- a/ports/libgo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libgo -Version: 3.1-1 -Homepage: https://github.com/yyzybb537/libgo -Description: The best stackful coroutine by c++11. -Supports: !(arm|uwp) diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 26339fc43..fdb028123 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -18,29 +18,29 @@ vcpkg_from_github( HEAD_REF master ) -file(REMOVE_RECURSE ${SOURCE_PATH}/third_party) -file(MAKE_DIRECTORY ${SOURCE_PATH}/third_party) -file(RENAME ${XHOOK_SOURCE_PATH} ${SOURCE_PATH}/third_party/xhook) +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party") +file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") +file(RENAME "${XHOOK_SOURCE_PATH}" "${SOURCE_PATH}/third_party/xhook") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook") if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows") else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/libgo-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/libgo-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json new file mode 100644 index 000000000..b9d85cc60 --- /dev/null +++ b/ports/libgo/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libgo", + "version": "3.1", + "port-version": 2, + "description": "The best stackful coroutine by c++11.", + "homepage": "https://github.com/yyzybb537/libgo", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index cc40c0d56..294592081 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3197,8 +3197,8 @@ "port-version": 2 }, "libgo": { - "baseline": "3.1-1", - "port-version": 0 + "baseline": "3.1", + "port-version": 2 }, "libgpg-error": { "baseline": "1.42", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index da7c1405a..976f87c31 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474", + "version": "3.1", + "port-version": 2 + }, { "git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01", "version-string": "3.1-1", -- cgit v1.2.3