diff options
| author | Don Venable <venabled@users.noreply.github.com> | 2021-02-02 17:36:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 14:36:30 -0800 |
| commit | bbcf31b05c6a77d296b0ef28f9613072b57805af (patch) | |
| tree | 12fa21f07892c7f4736b04acc42c1af44f46ea62 | |
| parent | 95f2e57839827cc59581792391f65317be2c361b (diff) | |
| download | vcpkg-bbcf31b05c6a77d296b0ef28f9613072b57805af.tar.gz vcpkg-bbcf31b05c6a77d296b0ef28f9613072b57805af.zip | |
[libffi] Added armv7-a to allowed architectures for Android 32 bit arm builds (#15821)
* Added armv7-a to allowed architectures for Android 32 bit arm builds
Closes #15820
* Fixed typo
* Bumped port version to 7
* Updated libffi version files
| -rw-r--r-- | ports/libffi/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/libffi/CONTROL | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libffi.json | 5 |
4 files changed, 10 insertions, 3 deletions
diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index a021c9ffd..c9eba2f13 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # config variables for ffi.h.in set(VERSION 3.3) -set(KNOWN_PROCESSORS x86 x86_64 AMD64 ARM ARM64 i386 armv7l aarch64) +set(KNOWN_PROCESSORS x86 x86_64 AMD64 ARM ARM64 i386 armv7l armv7-a aarch64) if(NOT CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_PROCESSORS) message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}") @@ -21,6 +21,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM") set(TARGET ARM) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l") set(TARGET ARM) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7-a") + set(TARGET ARM) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") set(TARGET ARM64) elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) diff --git a/ports/libffi/CONTROL b/ports/libffi/CONTROL index 477587af2..7ba4813a3 100644 --- a/ports/libffi/CONTROL +++ b/ports/libffi/CONTROL @@ -1,5 +1,5 @@ Source: libffi
Version: 3.3
-Port-Version: 6
+Port-Version: 7
Homepage: https://github.com/libffi/libffi
Description: Portable, high level programming interface to various calling conventions
diff --git a/versions/baseline.json b/versions/baseline.json index a1e687ac2..e6f949d91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "libffi": { "baseline": "3.3", - "port-version": 6 + "port-version": 7 }, "libflac": { "baseline": "1.3.3", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index b9525a9a3..03255992e 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7582c1b20c576263d22b8429155ead9117cc7c95", + "version-string": "3.3", + "port-version": 7 + }, + { "git-tree": "d656f226f68b97173701d07c53633a3d05702abb", "version-string": "3.3", "port-version": 6 |