From 00358cc88d6cf9285648ef0e13621c2308d94dec Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 24 Jan 2022 00:52:28 -0800 Subject: [PATCH] [eathread] Remove vcpkg_fail_port_install. (#22742) There was no supports expression, and there was ci.baseline.txt impact. The remaining ci.baseline.txt line item was x86-windows, so I tried building that. It results in: ``` C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(201): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(202): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(203): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(204): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(205): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(206): error C3861: '_InterlockedOr64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(207): error C3861: '_InterlockedAnd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(208): error C3861: '_InterlockedXor64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(209): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(216): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(217): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(218): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(219): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(220): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(221): error C3861: '_InterlockedOr64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(222): error C3861: '_InterlockedAnd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(223): error C3861: '_InterlockedXor64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(224): error C3861: '_InterlockedExchange64_INLINE': identifier not found ``` which is a build failure in the port, not a CI artifact, so I added that to "supports" as well. In support of https://github.com/microsoft/vcpkg/pull/21502 --- ports/eathread/portfile.cmake | 3 +-- ports/eathread/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/e-/eathread.json | 5 +++++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ports/eathread/portfile.cmake b/ports/eathread/portfile.cmake index 5d4d9669a9..421f7c591a 100644 --- a/ports/eathread/portfile.cmake +++ b/ports/eathread/portfile.cmake @@ -1,5 +1,4 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,7 +6,7 @@ vcpkg_from_github( REF e4367a36f2e55d10b2b994bfbae8edf21f15bafd SHA512 cd5a2aa6cdfe6fa538067919aa49e5ecd901898e12929dc852068ce66efe386032eb1fe667ea7d9b7a3d73a7bef1d90a683c0b90b6fb0d6d9a27950b05c4ab6a HEAD_REF master - PATCHES + PATCHES fix_cmake_install.patch ) diff --git a/ports/eathread/vcpkg.json b/ports/eathread/vcpkg.json index b5ad4d3cf3..4f18b4c7a3 100644 --- a/ports/eathread/vcpkg.json +++ b/ports/eathread/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eathread", "version-string": "1.32.09", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", "homepage": "https://github.com/electronicarts/EAThread", + "supports": "!uwp & x64", "dependencies": [ "eabase", "eastl" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7c11689f88..4f4c9ce0eb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -246,10 +246,6 @@ duktape:x64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail -eathread:arm64-windows=fail -eathread:arm-uwp=fail -eathread:x64-uwp=fail -eathread:x86-windows=fail ebml:arm-uwp=fail ebml:x64-uwp=fail ecsutil:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index a60b2af902..b3dc81bea2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1962,7 +1962,7 @@ }, "eathread": { "baseline": "1.32.09", - "port-version": 2 + "port-version": 3 }, "ebml": { "baseline": "1.4.2", diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index b9ee874827..4568b724d3 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "341734fa50c34beff0593368922f71829fb0ff19", + "version-string": "1.32.09", + "port-version": 3 + }, { "git-tree": "273dda3270d68ca1c465bb093cba07e71bd6a62f", "version-string": "1.32.09",