[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
This commit is contained in:
Don Venable 2021-02-02 17:36:30 -05:00 committed by GitHub
parent 95f2e57839
commit bbcf31b05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions

View File

@ -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)

View File

@ -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

View File

@ -2934,7 +2934,7 @@
},
"libffi": {
"baseline": "3.3",
"port-version": 6
"port-version": 7
},
"libflac": {
"baseline": "1.3.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7582c1b20c576263d22b8429155ead9117cc7c95",
"version-string": "3.3",
"port-version": 7
},
{
"git-tree": "d656f226f68b97173701d07c53633a3d05702abb",
"version-string": "3.3",