From e66a3d7ab7aab86dc80b1d12a7ccfe3ec4f2d052 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Sun, 23 Jan 2022 21:30:30 -0800
Subject: [PATCH] [cpuid] Remove vcpkg_fail_port_install.

The supports expression was missing a block for UWP that was in portfile.cmake. Also updates ci.baseline.txt.

In support of https://github.com/microsoft/vcpkg/pull/21502
---
 ports/cpuid/portfile.cmake | 1 -
 ports/cpuid/vcpkg.json     | 4 ++--
 scripts/ci.baseline.txt    | 3 ---
 versions/baseline.json     | 2 +-
 versions/c-/cpuid.json     | 5 +++++
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake
index 306ccd5ac4025f..6f38ec89bb7fa4 100644
--- a/ports/cpuid/portfile.cmake
+++ b/ports/cpuid/portfile.cmake
@@ -1,4 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json
index a2ae5e99bfd2bc..1e77b381c83f0e 100644
--- a/ports/cpuid/vcpkg.json
+++ b/ports/cpuid/vcpkg.json
@@ -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",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 53b1ca75e47aca..45fc92550a9cc2 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -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
diff --git a/versions/baseline.json b/versions/baseline.json
index e18b8f6005ff8e..977451c2d0f795 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1626,7 +1626,7 @@
     },
     "cpuid": {
       "baseline": "0.5.1",
-      "port-version": 2
+      "port-version": 3
     },
     "cpuinfo": {
       "baseline": "2021-04-04",
diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json
index 658b88edbc9566..097f9d93f739ac 100644
--- a/versions/c-/cpuid.json
+++ b/versions/c-/cpuid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8",
+      "version": "0.5.1",
+      "port-version": 3
+    },
     {
       "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c",
       "version": "0.5.1",