Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 20 commits into from
Dec 15, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f24350c
updated libunifex version
zeyangl Nov 17, 2021
7de0759
remove comment
zeyangl Nov 17, 2021
392948f
run x-add-versions --all
zeyangl Nov 17, 2021
74fc2f3
Update ports/libunifex/vcpkg.json
zeyangl Nov 17, 2021
b3b1715
rerun x-add-version libunifex
zeyangl Nov 17, 2021
72c4611
Update versions/l-/libunifex.json
zeyangl Nov 17, 2021
2b501a2
Merge branch 'master' of https://github.com/microsoft/vcpkg into lzy_…
zeyangl Nov 23, 2021
3ca4b7e
update libunifex to 12-07
zeyangl Dec 7, 2021
c562674
x-add-version
zeyangl Dec 7, 2021
a5e3cf0
Merge branch 'master' of github.com:zeyangl/vcpkg
zeyangl Dec 7, 2021
5aab7c3
Merge branch 'master' of https://github.com/microsoft/vcpkg
zeyangl Dec 7, 2021
8415e7c
libunifex port update
zeyangl Dec 12, 2021
dc80c81
Merge branch 'master' of https://github.com/microsoft/vcpkg
zeyangl Dec 12, 2021
8ce2a12
Update libunifex.json
zeyangl Dec 12, 2021
6e24400
Update fix-compile-error.patch
zeyangl Dec 12, 2021
3b71ef9
Update libunifex.json
zeyangl Dec 12, 2021
987b95d
remove unused
zeyangl Dec 14, 2021
5e49da3
x-add-versions
zeyangl Dec 14, 2021
89a516c
remove old version log
zeyangl Dec 14, 2021
8378f39
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions ports/libunifex/allow-warnings.patch → ports/libunifex/fix-compile-error.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
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()
33 changes: 0 additions & 33 deletions ports/libunifex/fix-install.patch
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions ports/libunifex/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
3 changes: 1 addition & 2 deletions ports/libunifex/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libunifex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971",
"version-date": "2021-12-07",
"port-version": 0
},
{
"git-tree": "7c98590771b98cb8c31e49867e78983853307a1f",
"version-date": "2021-08-01",
Expand Down