diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-09-04 02:00:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-03 17:00:37 -0700 |
| commit | 01198e2497d3b78ed399409fe70631126028687c (patch) | |
| tree | 1f24dbdab4795da38f7eb3a4574347dc8774fa40 | |
| parent | 9414ca11a93e188d061986f6fe6eb84c94938ed0 (diff) | |
| download | vcpkg-01198e2497d3b78ed399409fe70631126028687c.tar.gz vcpkg-01198e2497d3b78ed399409fe70631126028687c.zip | |
[folly] also support arm64 (#19738)
| -rw-r--r-- | ports/folly/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/folly/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/folly.json | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index a2e8a436e..21df520bf 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -1,5 +1,7 @@ -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - message(FATAL_ERROR "Folly only supports the x64 architecture.") +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64") +else() + vcpkg_fail_port_install(ON_ARCH "x86" "arm") endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index e7762e6cf..453e08e9c 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,9 +1,10 @@ { "name": "folly", "version-string": "2021.06.14.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", - "supports": "x64", + "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-chrono", "boost-context", diff --git a/versions/baseline.json b/versions/baseline.json index 0bdd97716..3f19fa544 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2098,7 +2098,7 @@ }, "folly": { "baseline": "2021.06.14.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.0.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 28e912a52..473a4c1c6 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "92b7d618fda609b74ea8862c9950e40a9f03418d", + "version-string": "2021.06.14.00", + "port-version": 1 + }, + { "git-tree": "4a11b9cd2ca209a5277f7b90bc8d1c6c6b501079", "version-string": "2021.06.14.00", "port-version": 0 |