mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 08:23:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libffi] Fix processors (#16285)

Browse Source 
* [libffi] fix build on apple silicon

* [libffi] add version files

* [libffi] changes

* [libffi] add version files

* [libffi] Rearrange target conditional list

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
autoantwort 2021-04-02 23:01:50 +02:00 committed by GitHub
parent 92a3c70f1d
commit 45bc3d367a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/libffi/CMakeLists.txt
View File

@ -11,23 +11,15 @@ endif()
# config variables for ffi.h.in # config variables for ffi.h.in
set(VERSION 3.3) set(VERSION 3.3)
set(KNOWN_PROCESSORS x86 x86_64 AMD64 ARM ARM64 i386 armv7l armv7-a aarch64) set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 armv7l armv7-a aarch64)
if(NOT CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_PROCESSORS) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor)
if(NOT lower_system_processor IN_LIST KNOWN_PROCESSORS)
message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}") message(FATAL_ERROR "Unknown processor: ${CMAKE_SYSTEM_PROCESSOR}")
endif() endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM") if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "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)
set(TARGET X86_FREEBSD)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
set(TARGET ARM_WIN32) set(TARGET ARM_WIN32)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
set(TARGET ARM_WIN64) set(TARGET ARM_WIN64)
@ -35,6 +27,12 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUA
set(TARGET X86_WIN32) set(TARGET X86_WIN32)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(TARGET X86_WIN64) set(TARGET X86_WIN64)
elseif(lower_system_processor MATCHES "arm64|aarch64")
set(TARGET ARM64)
elseif(lower_system_processor MATCHES "arm")
set(TARGET ARM)
elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(TARGET X86_FREEBSD)
elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 4) elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(TARGET X86_DARWIN) set(TARGET X86_DARWIN)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)

5
ports/libffi/CONTROL
View File

@ -1,5 +0,0 @@
Source: libffi
Version: 3.3
Port-Version: 7
Homepage: https://github.com/libffi/libffi
Description: Portable, high level programming interface to various calling conventions

7
ports/libffi/vcpkg.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "libffi",
"version": "3.3",
"port-version": 8,
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi"
}

2
versions/baseline.json
View File

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

5
versions/l-/libffi.json
View File

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