[libffi] Update to v3.4.2 (#18995)

* [libffi] Update to v3.4.2 * [vcpkg baseline] Update libffi * [libffi] Add i686 as supported processor * [vcpkg baseline] Update libffi
microsoft · Jul 19, 2021 · 3a28333 · 3a28333
1 parent fb84265
commit 3a28333
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 88 deletions.
diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt
@@ -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)
 
@@ -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

diff --git a/ports/libffi/fficonfig.h b/ports/libffi/fficonfig.h
@@ -25,10 +25,10 @@
 #define PACKAGE "libffi"
 #define PACKAGE_BUGREPORT "http://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
@@ -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

diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake
@@ -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})

diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json
@@ -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"
 }
diff --git a/ports/libffi/win32-disable-stackframe-check.patch b/ports/libffi/win32-disable-stackframe-check.patch
diff --git a/ports/libffi/win64-disable-stackframe-check.patch b/ports/libffi/win64-disable-stackframe-check.patch
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -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",

diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379",
+      "version": "3.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "c40f59f0527e2336818bd5d6b0d14ae2bdc5c286",
       "version": "3.3",