ffi 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e96bb396dbe6fdc7c8a68b4328bb9142e50a9c934a94aa79837fb26bfb195a97
-  data.tar.gz: efb9edb9a7e79911a1860d7ceb60b842840c2f469f248b7795c38cede57fddbe
+  metadata.gz: 7c1ae7c590f7dd4d8d821c6faf31c66499a90c421ff25fe14ce4465cc058b83f
+  data.tar.gz: e4c16035d46e13e752e215fdc87511c214db31cec9084cca3c2141a9d83469c7
 SHA512:
-  metadata.gz: c1f23d12fdea63b629ca8a09fd39b6b60aae31a5b25b54e15c8519a9b1e71bf8ca93d01c34b4a424d68fae8d9a6b22e171c45eb2e357ccdd6df9eaf7e7dd60cd
-  data.tar.gz: 0c47701aec04d869c1c62e71b88dbf5b33fbef3e1cf49819301e94e124817783db47e8e4427f3782b44f0516009e0e2def336423d594283f1d9b870bc4941765
+  metadata.gz: a4064371f99217b7b449c46915e4505b54a61785ec27a2b5cd51d798cc929ff58bef33ad9064ab93ca85ad2c5d5c07d515edb0ac5d673a468fb17abf18565627
+  data.tar.gz: a545c796f0b36fb7cac6ac06a73094274d077e0e0f54f55f67c129e6bff27b7679886a3adc87e9b3c173f975864dc78ac3d6277d8a8d1352f974b697ace0f8b4

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+1.13.1 / 2020-06-09
+-------------------
+
+Changed:
+* Revert use of `ucrtbase.dll` as default C library on Windows-MINGW.
+  `ucrtbase.dll` is still used on MSWIN target. #790
+* Test for `ffi_prep_closure_loc()` to make sure we can use this function.
+  This fixes incorrect use of system libffi on MacOS Mojave (10.14). #787
+* Update types.conf on x86_64-dragonflybsd
+
+
 1.13.0 / 2020-06-01
 -------------------
 

data/ext/ffi_c/extconf.rb

@@ -13,18 +13,17 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
                     "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ffi") ||
         (find_header("ffi.h", `xcrun --sdk macosx --show-sdk-path`.strip + "/usr/include/ffi") rescue false)
 
-    # Ensure we can link to ffi_call
-    libffi_ok &&= have_library("ffi", "ffi_call", [ "ffi.h" ]) ||
-                  have_library("libffi", "ffi_call", [ "ffi.h" ]) ||
-                  have_library("libffi-8", "ffi_call", [ "ffi.h" ])
+    # Ensure we can link to ffi_prep_closure_loc
+    libffi_ok &&= have_library("ffi", "ffi_prep_closure_loc", [ "ffi.h" ]) ||
+                  have_library("libffi", "ffi_prep_closure_loc", [ "ffi.h" ]) ||
+                  have_library("libffi-8", "ffi_prep_closure_loc", [ "ffi.h" ])
 
     if RbConfig::CONFIG['host_os'] =~ /mswin/
       have_library('libffi_convenience')
       have_library('shlwapi')
     end
 
-    # And we need a libffi version recent enough to provide ffi_closure_alloc
-    libffi_ok &&= have_func("ffi_closure_alloc")
+    libffi_ok
   end
 
   dir_config("ffi_c")

data/lib/ffi/platform.rb

@@ -129,7 +129,11 @@ module FFI
     end
 
     LIBC = if IS_WINDOWS
-      "ucrtbase.dll"
+      if RbConfig::CONFIG['host_os'] =~ /mingw/i
+        RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
+      else
+        "ucrtbase.dll"
+      end
     elsif IS_GNU
       GNU_LIBC
     elsif OS == 'cygwin'

data/lib/ffi/platform/x86_64-dragonflybsd/types.conf

@@ -1,9 +1,7 @@
 rbx.platform.typedef.*) = pointer
-rbx.platform.typedef.__char16_t = ushort
-rbx.platform.typedef.__char32_t = uint
+rbx.platform.typedef.___wchar_t = int
 rbx.platform.typedef.__clock_t = ulong
 rbx.platform.typedef.__clockid_t = ulong
-rbx.platform.typedef.__ct_rune_t = int
 rbx.platform.typedef.__fd_mask = ulong
 rbx.platform.typedef.__int16_t = short
 rbx.platform.typedef.__int32_t = int
@@ -17,16 +15,14 @@ rbx.platform.typedef.__int_least16_t = short
 rbx.platform.typedef.__int_least32_t = int
 rbx.platform.typedef.__int_least64_t = long
 rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intlp_t = long
 rbx.platform.typedef.__intmax_t = long
 rbx.platform.typedef.__intptr_t = long
-rbx.platform.typedef.__nl_item = int
 rbx.platform.typedef.__off_t = long
 rbx.platform.typedef.__pid_t = int
 rbx.platform.typedef.__ptrdiff_t = long
 rbx.platform.typedef.__register_t = long
 rbx.platform.typedef.__rlim_t = long
-rbx.platform.typedef.__rune_t = int
-rbx.platform.typedef.__segsz_t = long
 rbx.platform.typedef.__sig_atomic_t = int
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
@@ -34,7 +30,6 @@ rbx.platform.typedef.__ssize_t = long
 rbx.platform.typedef.__suseconds_t = long
 rbx.platform.typedef.__time_t = long
 rbx.platform.typedef.__timer_t = int
-rbx.platform.typedef.__u_register_t = ulong
 rbx.platform.typedef.__uint16_t = ushort
 rbx.platform.typedef.__uint32_t = uint
 rbx.platform.typedef.__uint64_t = ulong
@@ -47,9 +42,9 @@ rbx.platform.typedef.__uint_least16_t = ushort
 rbx.platform.typedef.__uint_least32_t = uint
 rbx.platform.typedef.__uint_least64_t = ulong
 rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintlp_t = ulong
 rbx.platform.typedef.__uintmax_t = ulong
 rbx.platform.typedef.__uintptr_t = ulong
-rbx.platform.typedef.__wchar_t = int
 rbx.platform.typedef.__wint_t = int
 rbx.platform.typedef.blkcnt_t = long
 rbx.platform.typedef.blksize_t = long
@@ -57,7 +52,6 @@ rbx.platform.typedef.c_caddr_t = pointer
 rbx.platform.typedef.caddr_t = string
 rbx.platform.typedef.clock_t = ulong
 rbx.platform.typedef.clockid_t = ulong
-rbx.platform.typedef.cpulock_t = uint
 rbx.platform.typedef.daddr_t = int
 rbx.platform.typedef.dev_t = uint
 rbx.platform.typedef.fixpt_t = uint
@@ -85,14 +79,9 @@ rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = long
 rbx.platform.typedef.lwpid_t = int
 rbx.platform.typedef.mode_t = ushort
-rbx.platform.typedef.mqd_t = int
 rbx.platform.typedef.nlink_t = uint
 rbx.platform.typedef.off_t = long
-rbx.platform.typedef.pd_entry_t = ulong
-rbx.platform.typedef.pdp_entry_t = ulong
 rbx.platform.typedef.pid_t = int
-rbx.platform.typedef.pml4_entry_t = ulong
-rbx.platform.typedef.pt_entry_t = ulong
 rbx.platform.typedef.pthread_key_t = int
 rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.qaddr_t = pointer
@@ -116,7 +105,6 @@ rbx.platform.typedef.u_int64_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_long = ulong
 rbx.platform.typedef.u_quad_t = ulong
-rbx.platform.typedef.u_register_t = ulong
 rbx.platform.typedef.u_short = ushort
 rbx.platform.typedef.uid_t = uint
 rbx.platform.typedef.uint = uint
@@ -139,10 +127,4 @@ rbx.platform.typedef.unchar = uchar
 rbx.platform.typedef.useconds_t = uint
 rbx.platform.typedef.ushort = ushort
 rbx.platform.typedef.v_caddr_t = pointer
-rbx.platform.typedef.vm_offset_t = ulong
-rbx.platform.typedef.vm_ooffset_t = long
-rbx.platform.typedef.vm_paddr_t = ulong
-rbx.platform.typedef.vm_pindex_t = ulong
-rbx.platform.typedef.vm_poff_t = ulong
-rbx.platform.typedef.vm_size_t = ulong
-rbx.platform.typedef.vm_spindex_t = ulong
+rbx.platform.typedef.wchar_t = int

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.13.0'
+  VERSION = '1.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake