diff --git a/ports/libcoro/0003-fix-pkgconfig-includedir.patch b/ports/libcoro/0003-fix-pkgconfig-includedir.patch new file mode 100644 index 0000000000..ed4cf30769 --- /dev/null +++ b/ports/libcoro/0003-fix-pkgconfig-includedir.patch @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000000..4adbad9814 --- /dev/null +++ b/ports/libcoro/0004-fix-pkgconfig-on-windows.patch @@ -0,0 +1,16 @@ +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 e48f240e97..c4a16fb68c 100644 --- a/ports/libcoro/portfile.cmake +++ b/ports/libcoro/portfile.cmake @@ -1,19 +1,25 @@ +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 9554fcaf721188e2475933fb8fe6b35f879479af9acb8b011545d66e588a98811f69100a4392e62c3c8bf05e8177760778c44ed4357d40d0a6349833a93fb8e8 + SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8 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 - threading LIBCORO_FEATURE_THREADING ) vcpkg_cmake_configure( diff --git a/ports/libcoro/vcpkg.json b/ports/libcoro/vcpkg.json index e6a9891b06..0746f37088 100644 --- a/ports/libcoro/vcpkg.json +++ b/ports/libcoro/vcpkg.json @@ -1,12 +1,10 @@ { "name": "libcoro", - "version": "0.9", + "version": "0.10", "description": "C++20 coroutine library", "homepage": "https://github.com/jbaldwin/libcoro", "license": "Apache-2.0", - "supports": "!windows", "dependencies": [ - "tl-expected", { "name": "vcpkg-cmake", "host": true @@ -14,8 +12,7 @@ ], "default-features": [ "networking", - "ssl", - "threading" + "ssl" ], "features": { "networking": { @@ -24,6 +21,10 @@ "c-ares" ] }, + "platform": { + "description": "Include linux platform features.", + "supports": "linux" + }, "ssl": { "description": "Include SSL features.", "dependencies": [ @@ -36,9 +37,6 @@ }, "openssl" ] - }, - "threading": { - "description": "Include multithreading features." } } } diff --git a/versions/baseline.json b/versions/baseline.json index f2932131fc..7033443803 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4153,7 +4153,7 @@ "port-version": 0 }, "libcoro": { - "baseline": "0.9", + "baseline": "0.10", "port-version": 0 }, "libcorrect": { diff --git a/versions/l-/libcoro.json b/versions/l-/libcoro.json index 12ad22eb9c..197233ad9d 100644 --- a/versions/l-/libcoro.json +++ b/versions/l-/libcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf", + "version": "0.10", + "port-version": 0 + }, { "git-tree": "36f9c61aa64e8be9670199b9efad6cec4e83b805", "version": "0.9",