[bullet3] Remove vcpkg_fail_port_install. (#22729)

* [bullet3] Remove vcpkg_fail_port_install.

The supports expression and the portfile.cmake disagreed.

Supports: !((windows | linux) & (arm | uwp))
Portfile: osx | !(arm | arm64 | uwp)

If we demorgan the supports expression we get something closer to the portfile:
!(windows | linux) | !(arm | uwp)

If we take "!(windows | linux)" to mean that the author meant "osx", and assume arm64 implies arm, we end up with:

osx | !(arm | uwp)

In support of: https://github.com/microsoft/vcpkg/pull/21502

* Also remove ci.baseline.txt entries now covered by vcpkg.json.
This commit is contained in:
Billy O'Neal 2022-01-23 22:43:39 -08:00 committed by GitHub
parent b868bbe34b
commit 485e459074
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions

View File

@ -1,7 +1,3 @@
if (NOT VCPKG_TARGET_IS_OSX)
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
endif()
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(

View File

@ -1,10 +1,10 @@
{
"name": "bullet3",
"version": "3.17",
"port-version": 3,
"port-version": 4,
"description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library",
"homepage": "https://github.com/bulletphysics/bullet3",
"supports": "!((windows | linux) & (arm | uwp))",
"supports": "osx | !(arm | uwp)",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -71,9 +71,6 @@ botan:x64-uwp=fail
breakpad:arm64-windows=fail
buck-yeh-bux:x64-linux=fail
buck-yeh-bux-mariadb-client:x64-linux=fail
bullet3:arm64-windows=fail
bullet3:arm-uwp=fail
bullet3:x64-uwp=fail
caf:arm-uwp=fail
caf:x64-uwp=fail
caffe2:x86-windows=fail

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d986cc96144fa3de5201d56a508f348db9b66e71",
"version": "3.17",
"port-version": 4
},
{
"git-tree": "88add55351bf89f89e584924663861c0a827bdf5",
"version": "3.17",

View File

@ -1174,7 +1174,7 @@
},
"bullet3": {
"baseline": "3.17",
"port-version": 3
"port-version": 4
},
"bustache": {
"baseline": "1.1.0",