From 2b6075beac34e53017a6f0bca2a1b300a4c64a15 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 14 Mar 2024 00:42:21 +0100 Subject: [PATCH] [libcoro] Update to 0.11.1 (#37425) --- ports/libcoro/0001-allow-shared-lib.patch | 9 --------- ports/libcoro/0002-disable-git-config.patch | 18 ------------------ .../0003-fix-pkgconfig-includedir.patch | 10 ---------- .../0004-fix-pkgconfig-on-windows.patch | 16 ---------------- ports/libcoro/portfile.cmake | 19 +++++++------------ ports/libcoro/vcpkg.json | 13 +++---------- versions/baseline.json | 2 +- versions/l-/libcoro.json | 5 +++++ 8 files changed, 16 insertions(+), 76 deletions(-) delete mode 100644 ports/libcoro/0001-allow-shared-lib.patch delete mode 100644 ports/libcoro/0002-disable-git-config.patch delete mode 100644 ports/libcoro/0003-fix-pkgconfig-includedir.patch delete mode 100644 ports/libcoro/0004-fix-pkgconfig-on-windows.patch diff --git a/ports/libcoro/0001-allow-shared-lib.patch b/ports/libcoro/0001-allow-shared-lib.patch deleted file mode 100644 index 47de8119bc..0000000000 --- a/ports/libcoro/0001-allow-shared-lib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,4 +92,4 @@ - endif() - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "") diff --git a/ports/libcoro/0002-disable-git-config.patch b/ports/libcoro/0002-disable-git-config.patch deleted file mode 100644 index f25833ae04..0000000000 --- a/ports/libcoro/0002-disable-git-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,9 +7,9 @@ - - # Set the githooks directory to auto format and update the readme. --message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks") --execute_process( -- COMMAND git config --local core.hooksPath .githooks -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} --) -+#message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks") -+#execute_process( -+# COMMAND git config --local core.hooksPath .githooks -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+#) - - option(LIBCORO_EXTERNAL_DEPENDENCIES "Use Cmake find_package to resolve dependencies instead of embedded libraries, Default=OFF." OFF) diff --git a/ports/libcoro/0003-fix-pkgconfig-includedir.patch b/ports/libcoro/0003-fix-pkgconfig-includedir.patch deleted file mode 100644 index ed4cf30769..0000000000 --- a/ports/libcoro/0003-fix-pkgconfig-includedir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/libcoro.pc.in b/libcoro.pc.in ---- a/libcoro.pc.in -+++ b/libcoro.pc.in -@@ -1,5 +1,5 @@ - prefix="@CMAKE_INSTALL_PREFIX@" - libdir="${prefix}/lib" --includedir="@CMAKE_INSTALL_INCLUDEDIR@" -+includedir="${prefix}/include" - - Name: @PROJECT_NAME@ diff --git a/ports/libcoro/0004-fix-pkgconfig-on-windows.patch b/ports/libcoro/0004-fix-pkgconfig-on-windows.patch deleted file mode 100644 index 4adbad9814..0000000000 --- a/ports/libcoro/0004-fix-pkgconfig-on-windows.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -186,7 +186,11 @@ - - - # generate pc file for pkg-config --string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) -+if(MSVC) -+ set(target1 ${PROJECT_NAME}) -+else() -+ string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) -+endif() - configure_file(libcoro.pc.in libcoro.pc @ONLY) - - install(TARGETS libcoro) diff --git a/ports/libcoro/portfile.cmake b/ports/libcoro/portfile.cmake index c4a16fb68c..d3512d5182 100644 --- a/ports/libcoro/portfile.cmake +++ b/ports/libcoro/portfile.cmake @@ -1,27 +1,19 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbaldwin/libcoro REF "v${VERSION}" - SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8 + SHA512 fd3eb22a055db9567da482182a90d44c79ee8ccb641490945cb45b07686a32a31b7b37aa35b1f3f676a6ede366db01c9cd7b5f7ded899cb1133cdd1aac510154 HEAD_REF master - PATCHES - 0001-allow-shared-lib.patch - 0002-disable-git-config.patch - 0003-fix-pkgconfig-includedir.patch - 0004-fix-pkgconfig-on-windows.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES networking LIBCORO_FEATURE_NETWORKING - platform LIBCORO_FEATURE_PLATFORM - ssl LIBCORO_FEATURE_SSL + tls LIBCORO_FEATURE_TLS ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -29,6 +21,7 @@ vcpkg_cmake_configure( -DLIBCORO_EXTERNAL_DEPENDENCIES=ON -DLIBCORO_BUILD_TESTS=OFF -DLIBCORO_BUILD_EXAMPLES=OFF + -DLIBCORO_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) vcpkg_cmake_install() @@ -38,3 +31,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() diff --git a/ports/libcoro/vcpkg.json b/ports/libcoro/vcpkg.json index 0746f37088..a436b80431 100644 --- a/ports/libcoro/vcpkg.json +++ b/ports/libcoro/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcoro", - "version": "0.10", + "version": "0.11.1", "description": "C++20 coroutine library", "homepage": "https://github.com/jbaldwin/libcoro", "license": "Apache-2.0", @@ -10,22 +10,15 @@ "host": true } ], - "default-features": [ - "networking", - "ssl" - ], "features": { "networking": { "description": "Include networking features.", + "supports": "linux", "dependencies": [ "c-ares" ] }, - "platform": { - "description": "Include linux platform features.", - "supports": "linux" - }, - "ssl": { + "tls": { "description": "Include SSL features.", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 0384aef0c5..21f89e8433 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4221,7 +4221,7 @@ "port-version": 0 }, "libcoro": { - "baseline": "0.10", + "baseline": "0.11.1", "port-version": 0 }, "libcorrect": { diff --git a/versions/l-/libcoro.json b/versions/l-/libcoro.json index 197233ad9d..f3c35167a0 100644 --- a/versions/l-/libcoro.json +++ b/versions/l-/libcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b518fbd7c395e04a3a720c1aba78a3a9a94930e9", + "version": "0.11.1", + "port-version": 0 + }, { "git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf", "version": "0.10",