diff --git a/ports/libunifex/allow-warnings.patch b/ports/libunifex/fix-compile-error.patch similarity index 76% rename from ports/libunifex/allow-warnings.patch rename to ports/libunifex/fix-compile-error.patch index 272624f0667c16..10d578feeaaeb2 100644 --- a/ports/libunifex/allow-warnings.patch +++ b/ports/libunifex/fix-compile-error.patch @@ -1,15 +1,15 @@ -diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake -index cb99ae4..9825532 100644 ---- a/cmake/unifex_env.cmake -+++ b/cmake/unifex_env.cmake -@@ -21,8 +21,8 @@ endif() - - if (MSVC) - # warning level 3 and all warnings as errors -- add_compile_options(/W3 /WX) -+ add_compile_options(/W3) - else() - # lots of warnings and all warnings as errors -- add_compile_options(-Wall -Wextra -pedantic -Werror) -+ add_compile_options(-Wall -Wextra -pedantic) - endif() +diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake +index cb99ae4..9825532 100644 +--- a/cmake/unifex_env.cmake ++++ b/cmake/unifex_env.cmake +@@ -21,8 +21,8 @@ endif() + + if (MSVC) + # warning level 3 and all warnings as errors +- add_compile_options(/W3 /WX) ++ add_compile_options(/W3 /WX /Zc:externConstexpr /EHsc) + else() + # lots of warnings and all warnings as errors +- add_compile_options(-Wall -Wextra -pedantic -Werror) ++ add_compile_options(-Wall -Wextra -pedantic) + endif() diff --git a/ports/libunifex/fix-install.patch b/ports/libunifex/fix-install.patch deleted file mode 100644 index 2b454c49c19a6c..00000000000000 --- a/ports/libunifex/fix-install.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 3f25517..3c34a54 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -67,10 +67,27 @@ configure_file( - target_include_directories(unifex - PUBLIC - $ -- "${PROJECT_BINARY_DIR}/include") -+ $ -+ $) - - target_compile_features(unifex PUBLIC cxx_std_17) - - if(CXX_COROUTINES_HAVE_COROUTINES) - target_link_libraries(unifex PUBLIC std::coroutines) - endif() -+ -+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/unifex -+ DESTINATION include -+) -+install(FILES ${PROJECT_BINARY_DIR}/include/unifex/config.hpp -+ DESTINATION include/unifex -+) -+ -+install(TARGETS unifex -+ EXPORT unifex-config -+ DESTINATION lib -+) -+install(EXPORT unifex-config -+ NAMESPACE unofficial:: -+ DESTINATION lib/cmake/unifex -+) diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake index f7379fc20c4d18..bca5eca211d268 100644 --- a/ports/libunifex/portfile.cmake +++ b/ports/libunifex/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookexperimental/libunifex - REF e36b43834329acc75f99910316d3ecec15c0f665 - SHA512 58f738b49d18982fd3916500c78e8090a266738ec4a8ba416b004fa2c7db718db5ce0e27f5e4e22eaddcc27c8d1618bcb2bc080eee1a31d98543e2595ccc1135 + REF 9df21c58d34ce8a1cd3b15c3a7347495e29417a0 + SHA512 2a1c6dbe0e66893be888c301e53b5d2813049047a817e9e1562acf2dec4ae79dec7db90409cd415c59238f2f3e2738e52f86a424041459390c720568ee52d860 HEAD_REF master PATCHES - fix-install.patch - allow-warnings.patch + fix-compile-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -21,7 +20,9 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_CXX_STANDARD:STRING=20 ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unifex CONFIG_PATH lib/cmake/unifex) vcpkg_copy_pdbs() diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json index 82101d6b975265..20add341a95247 100644 --- a/ports/libunifex/vcpkg.json +++ b/ports/libunifex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libunifex", - "version-date": "2021-08-01", - "port-version": 1, + "version-date": "2021-12-07", "description": "Unified Executors", "homepage": "https://github.com/facebookexperimental/libunifex", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2681bb9fc7f115..54800d03cdc967 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4005,8 +4005,8 @@ "port-version": 1 }, "libunifex": { - "baseline": "2021-08-01", - "port-version": 1 + "baseline": "2021-12-07", + "port-version": 0 }, "libunistring": { "baseline": "0.9.10", diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json index 2eb60baac970a1..05aad35f1b124d 100644 --- a/versions/l-/libunifex.json +++ b/versions/l-/libunifex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971", + "version-date": "2021-12-07", + "port-version": 0 + }, { "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f", "version-date": "2021-08-01",