[libunifex] Update to 2021-12-07 (#21995)

* updated libunifex version * remove comment * run x-add-versions --all * Update ports/libunifex/vcpkg.json Co-authored-by: JonLiu1993 <[email protected]> * rerun x-add-version libunifex * Update versions/l-/libunifex.json Co-authored-by: JonLiu1993 <[email protected]> * update libunifex to 12-07 * x-add-version * libunifex port update force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc * Update libunifex.json version update * Update fix-compile-error.patch relax clang warnings * Update libunifex.json git x-add-version libunifex * remove unused * x-add-versions * remove old version log Co-authored-by: JonLiu1993 <[email protected]> Co-authored-by: Billy Robert O'Neal III <[email protected]>
microsoft · Dec 15, 2021 · 4ffe8b0 · 4ffe8b0
1 parent 6b82b23
commit 4ffe8b0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 56 deletions.
diff --git a/ports/libunifex/allow-warnings.patch → ports/libunifex/fix-compile-error.patch b/ports/libunifex/allow-warnings.patch → 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
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971",
+      "version-date": "2021-12-07",
+      "port-version": 0
+    },
     {
       "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f",
       "version-date": "2021-08-01",