aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorDon Venable <venabled@users.noreply.github.com>2021-02-02 17:36:30 -0500
committerGitHub <noreply@github.com>2021-02-02 14:36:30 -0800
commitbbcf31b05c6a77d296b0ef28f9613072b57805af (patch)
tree12fa21f07892c7f4736b04acc42c1af44f46ea62 /ports
parent95f2e57839827cc59581792391f65317be2c361b (diff)
downloadvcpkg-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
Diffstat (limited to 'ports')
-rw-r--r--ports/libffi/CMakeLists.txt4
-rw-r--r--ports/libffi/CONTROL2
2 files changed, 4 insertions, 2 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