diff options
| author | Joakim L. Gilje <jgilje@jgilje.net> | 2021-04-28 22:51:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 13:51:03 -0700 |
| commit | 05f715e6d0fb815c883dc4c2768334c4fa9019e1 (patch) | |
| tree | 4106c9b57b47d7f103acaac86990d41a69db9b3f | |
| parent | 7ab13e4d6902a2871f5ac3325e64fa6aafdf94c1 (diff) | |
| download | vcpkg-05f715e6d0fb815c883dc4c2768334c4fa9019e1.tar.gz vcpkg-05f715e6d0fb815c883dc4c2768334c4fa9019e1.zip | |
[botan] add arm (#17509)
| -rw-r--r-- | ports/botan/CONTROL | 8 | ||||
| -rw-r--r-- | ports/botan/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/botan/vcpkg.json | 13 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 | ||||
| -rw-r--r-- | versions/b-/botan.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
6 files changed, 23 insertions, 11 deletions
diff --git a/ports/botan/CONTROL b/ports/botan/CONTROL deleted file mode 100644 index 255e2f116..000000000 --- a/ports/botan/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: botan -Version: 2.16.0 -Port-Version: 0 -Homepage: https://botan.randombit.net -Description: A cryptography library written in C++11 - -Feature: amalgamation -Description: Do an amalgamation build of the library diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 746dc6e62..cee4a0e27 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -42,6 +42,10 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(BOTAN_FLAG_CPU x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(BOTAN_FLAG_CPU x86_64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(BOTAN_FLAG_CPU arm32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(BOTAN_FLAG_CPU arm64) else() message(FATAL_ERROR "Unsupported architecture") endif() diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json new file mode 100644 index 000000000..48b62c95c --- /dev/null +++ b/ports/botan/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "botan", + "version": "2.16.0", + "port-version": 1, + "description": "A cryptography library written in C++11", + "homepage": "https://botan.randombit.net", + "supports": "!(windows & arm)", + "features": { + "amalgamation": { + "description": "Do an amalgamation build of the library" + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 920991883..416c39520 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -62,8 +62,6 @@ blosc:x64-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail bond:x64-uwp=fail -botan:arm64-windows=fail -botan:arm-uwp=fail botan:x64-uwp=fail breakpad:arm64-windows=fail bullet3:arm64-windows=fail diff --git a/versions/b-/botan.json b/versions/b-/botan.json index d9d9b8fd9..8b68bd2fb 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7776bdc54cb37a29c18701d4332e4537e6be357a", + "version": "2.16.0", + "port-version": 1 + }, + { "git-tree": "cb5674c8a62b85d8862f3064b2797173df10950d", "version-string": "2.16.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index e7e4eaeb0..6b2f3447e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1014,7 +1014,7 @@ }, "botan": { "baseline": "2.16.0", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", |