Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions ports/libffi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ if(NOT CMAKE_SYSTEM_PROCESSOR)
endif()

# config variables for ffi.h.in
set(VERSION 3.3)
set(VERSION 3.4.2)

set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 armv7l armv7-a aarch64)
set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64)

string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor)

Expand Down Expand Up @@ -74,7 +74,8 @@ endif()
set(FFI_SOURCES
src/closures.c
src/prep_cif.c
src/types.c)
src/types.c
src/tramp.c)

if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64")
set(FFI_SOURCES
Expand Down
6 changes: 3 additions & 3 deletions ports/libffi/fficonfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
#define PACKAGE "libffi"
#define PACKAGE_BUGREPORT "https://github.com/libffi/libffi/issues"
#define PACKAGE_NAME "libffi"
#define PACKAGE_STRING "libffi 3.3"
#define PACKAGE_STRING "libffi 3.4.2"
#define PACKAGE_TARNAME "libffi"
#define PACKAGE_URL ""
#define PACKAGE_VERSION "3.3"
#define PACKAGE_VERSION "3.4.2"
#define SIZEOF_DOUBLE 8
#define SIZEOF_LONG_DOUBLE 8
#ifndef _WIN64
Expand All @@ -42,7 +42,7 @@
#define SYMBOL_UNDERSCORE 1
#endif
#endif
#define VERSION "3.3"
#define VERSION "3.4.2"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
Expand Down
9 changes: 3 additions & 6 deletions ports/libffi/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
set(VERSION 3.3)
set(VERSION 3.4.2)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libffi/libffi
REF v3.3
SHA512 62798fb31ba65fa2a0e1f71dd3daca30edcf745dc562c6f8e7126e54db92572cc63f5aa36d927dd08375bb6f38a2380ebe6c5735f35990681878fc78fc9dbc83
REF v${VERSION}
SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388
HEAD_REF master
PATCHES
win64-disable-stackframe-check.patch
win32-disable-stackframe-check.patch
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand Down
3 changes: 1 addition & 2 deletions ports/libffi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libffi",
"version": "3.3",
"port-version": 9,
"version": "3.4.2",
"description": "Portable, high level programming interface to various calling conventions",
"homepage": "https://github.com/libffi/libffi"
}
29 changes: 0 additions & 29 deletions ports/libffi/win32-disable-stackframe-check.patch

This file was deleted.

43 changes: 0 additions & 43 deletions ports/libffi/win64-disable-stackframe-check.patch

This file was deleted.

12 changes: 6 additions & 6 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3120,14 +3120,14 @@
"baseline": "0.6.0-1",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libe57": {
"baseline": "1.1.312",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libepoxy": {
"baseline": "1.5.5",
"port-version": 0
Expand All @@ -3149,8 +3149,8 @@
"port-version": 0
},
"libffi": {
"baseline": "3.3",
"port-version": 9
"baseline": "3.4.2",
"port-version": 0
},
"libfido2": {
"baseline": "1.7.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libffi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379",
"version": "3.4.2",
"port-version": 0
},
{
"git-tree": "c40f59f0527e2336818bd5d6b0d14ae2bdc5c286",
"version": "3.3",
Expand Down