Skip to content

[libffi] Support arm/arm64 #10485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 6, 2020
Merged

[libffi] Support arm/arm64 #10485

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d3fab9
[libffi] Support arm/arm64
Mar 20, 2020
ffe2e63
[libffi] Use VCPKG_TARGET_ARCHITECTURE to determine triplet
Mar 22, 2020
97184f0
[libffi] Use VCPKG_TARGET_ARCHITECTURE in CMakeLists.txt
Mar 23, 2020
ed62297
update baseline
Mar 26, 2020
7bf3f13
re-trigger ci test
Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ports/libffi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ if(CMAKE_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 "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM")
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND ARCH_NAME STREQUAL "arm")
set(TARGET ARM_WIN32)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND ARCH_NAME STREQUAL "arm64")
set(TARGET ARM_WIN64)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND ARCH_NAME STREQUAL "x86")
set(TARGET X86_WIN32)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND ARCH_NAME STREQUAL "x64")
set(TARGET X86_WIN64)
elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(TARGET X86_DARWIN)
Expand Down
5 changes: 2 additions & 3 deletions ports/libffi/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Source: libffi
Version: 3.3
Version: 3.3-1
Homepage: https://github.com/libffi/libffi
Description: Portable, high level programming interface to various calling conventions
Supports: !arm
Description: Portable, high level programming interface to various calling conventions
11 changes: 6 additions & 5 deletions ports/libffi/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h
-DARCH_NAME=${VCPKG_TARGET_ARCHITECTURE}
OPTIONS_DEBUG
-DFFI_SKIP_HEADERS=ON
)
Expand All @@ -23,13 +24,13 @@ vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()

if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(READ ${CURRENT_PACKAGES_DIR}/include/ffi.h FFI_H)
string(REPLACE " *know* they are going to link with the static library. */"
" *know* they are going to link with the static library. */
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ffi.h
" *know* they are going to link with the static library. */"
" *know* they are going to link with the static library. */

#define FFI_BUILDING
" FFI_H "${FFI_H}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/ffi.h "${FFI_H}")
"
)
endif()

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)