aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-07-23 04:37:49 +0800
committerGitHub <noreply@github.com>2021-07-22 13:37:49 -0700
commit1b1d1b209d45cf3df696f9040fb099a80bec0d84 (patch)
tree63920f7e8197b31814056afd8f39550513e5798b
parentb04a32af28470015158f3ac4ad2d2a6ed6006c83 (diff)
downloadvcpkg-1b1d1b209d45cf3df696f9040fb099a80bec0d84.tar.gz
vcpkg-1b1d1b209d45cf3df696f9040fb099a80bec0d84.zip
[libgo] Add DISABLE_PARALLEL_CONFIGURE (#19037)
* [libgo] Add DISABLE_PARALLEL_CONFIGURE * update version files * Update deprecated functions * Update versions/l-/libgo.json
-rw-r--r--ports/libgo/CONTROL5
-rw-r--r--ports/libgo/portfile.cmake30
-rw-r--r--ports/libgo/vcpkg.json14
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/l-/libgo.json5
5 files changed, 36 insertions, 22 deletions
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,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474",
+ "version": "3.1",
+ "port-version": 2
+ },
+ {
"git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01",
"version-string": "3.1-1",
"port-version": 0