3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[capnproto] Remove vcpkg_fail_port_install. (#22730)

Browse Source 
* [capnproto] Remove vcpkg_fail_port_install.

The portfile and vcpkg.json disagreed.

```
vcpkg.json: !uwp & !((arm | arm64) & windows)
portfile:   !uwp & (!windows | !(arm | arm64))
```

If we demorgan the supports expression once they agree:

```
!uwp & (!(arm | arm64) | !windows)
```

Also, arm64 implies arm:

```
!uwp & (!arm | !windows)
```

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

* Put the supports expression into DNF as suggested by @strega-nil.
This commit is contained in:
Billy O'Neal 2022-01-24 13:51:42 -08:00 committed by GitHub
parent b06a316ff4
commit 4945d50e90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/capnproto/portfile.cmake
View File

@ -1,8 +1,3 @@
vcpkg_fail_port_install(ON_TARGET UWP)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fail_port_install(ON_ARCH arm arm64)
endif()
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(

4
ports/capnproto/vcpkg.json
View File

@ -1,10 +1,10 @@
{
"name": "capnproto",
"version": "0.9.1",
"port-version": 1,
"port-version": 2,
"description": "Data interchange format and capability-based RPC system",
"homepage": "https://capnproto.org/",
"supports": "!uwp & !((arm | arm64) & windows)",
"supports": "!windows | (!uwp & !arm)",
"dependencies": [
{
"name": "vcpkg-cmake",

2
versions/baseline.json
View File

@ -1226,7 +1226,7 @@
},
"capnproto": {
"baseline": "0.9.1",
"port-version": 1
"port-version": 2
},
"capstone": {
"baseline": "4.0.2",

5
versions/c-/capnproto.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "17b054432f141c746019130d2b689d4fd4919938",
"version": "0.9.1",
"port-version": 2
},
{
"git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7",
"version": "0.9.1",