Skip to content

[cpuid] Remove vcpkg_fail_port_install. #22735

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

Merged
BillyONeal merged 1 commit into from
Jan 24, 2022
Merged

[cpuid] Remove vcpkg_fail_port_install. #22735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion ports/cpuid/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
Expand Down
4 changes: 2 additions & 2 deletions ports/cpuid/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "cpuid",
"version": "0.5.1",
"port-version": 2,
"port-version": 3,
"description": "Provides CPU identification for the x86 (and x86_64)",
"homepage": "https://github.com/anrieff/libcpuid",
"supports": "x86 | x64",
"supports": "(x86 | x64) & !uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,9 +528,6 @@ libcopp:arm-uwp=fail
# Missing system libraries on linux to run/prepare autoconf
libgpod:x64-linux=fail
libgpod:x64-osx=fail
cpuid:arm-uwp=fail
cpuid:x64-uwp=fail
cpuid:arm64-windows=fail
libdatrie:x64-linux=fail
libdatrie:x64-osx=fail
libepoxy:arm-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@
},
"cpuid": {
"baseline": "0.5.1",
"port-version": 2
"port-version": 3
},
"cpuinfo": {
"baseline": "2021-04-04",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cpuid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8",
"version": "0.5.1",
"port-version": 3
},
{
"git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c",
"version": "0.5.1",
Expand Down