ffi 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b935d4af8929617d392e006c859332b37f754114850da947258561823bfb81b6
-  data.tar.gz: 7a56d828fed5ab247416d1425c70ac330704b16713922132e7ad6220df94195b
+  metadata.gz: ed55e9142667c9fd64d3debecfcbbe03243438de4e52f91251da5e8f68e1879c
+  data.tar.gz: e014b6310daff4aa37ff41dacac9d2e603e2de6df2befc72d4754819884dd673
 SHA512:
-  metadata.gz: 9afe880918848377b8ce402b0504833e5b3f0328ef8c878869f0ff0aa4c6f18d82c57cbe1617528416dc261e2fafa966dea08331b84c08beb49b75aa164f884d
-  data.tar.gz: e8632420a47345812ccc66bb72460705cd9bdbd034ae1bfed62920cb2851d6c8291cbad4540997c597a70dc4f8aa21111818e87b473d75dced69b7357be3e952
+  metadata.gz: 32189e26f80dc44e46841b4683c5b95a999afb0142788a903b6d3c106b1d814f7f1c6a30b9b72061cab61fc86179787b774479d7bede31d3b5165d6c4a4903df
+  data.tar.gz: 97c9e14a6844728f42b533407e1e147352b2f672a3d37cef535e6b4386fa2c3e6eed78795e393f48c04c3d7cda789f231047ef486a117b68162cc09138235c0c

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+1.15.2 / 2021-06-16
+-------------------
+
+Added:
+* Add support for Windows MINGW-UCRT build. #903
+* Add `/opt/homebrew/lib/` to fallback search paths to improve homebrew support. #880 #882
+
+Changed:
+* Regenerate `types.conf` for FreeBSD12 aarch64. #902
+
+
 1.15.1 / 2021-05-22
 -------------------
 

data/lib/ffi/library.rb

@@ -126,7 +126,7 @@ module FFI
               else
                 # TODO better library lookup logic
                 unless libname.start_with?("/") || FFI::Platform.windows?
-                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/'].find do |pth|
+                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/', '/opt/homebrew/lib/'].find do |pth|
                     File.exist?(pth + libname)
                   end
                   if path

data/lib/ffi/platform.rb

@@ -132,11 +132,8 @@ module FFI
     end
 
     LIBC = if IS_WINDOWS
-      if RbConfig::CONFIG['host_os'] =~ /mingw/i
-        RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
-      else
-        "ucrtbase.dll"
-      end
+      crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
+      "#{crtname}.dll"
     elsif IS_GNU
       GNU_LIBC
     elsif OS == 'cygwin'

data/lib/ffi/platform/aarch64-freebsd/types.conf

@@ -39,9 +39,9 @@ rbx.platform.typedef.__segsz_t = int
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__suseconds_t = int
+rbx.platform.typedef.__suseconds_t = long
 rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
+rbx.platform.typedef.__time_t = long
 rbx.platform.typedef.__timer_t = int
 rbx.platform.typedef.__uid_t = uint
 rbx.platform.typedef.__uint16_t = ushort

data/lib/ffi/platform/aarch64-freebsd12/types.conf

@@ -1,128 +1,181 @@
+rbx.platform.typedef.*) = pointer
+rbx.platform.typedef.___wchar_t = uint
+rbx.platform.typedef.__accmode_t = int
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__char16_t = ushort
+rbx.platform.typedef.__char32_t = uint
 rbx.platform.typedef.__clock_t = int
 rbx.platform.typedef.__clockid_t = int
-rbx.platform.typedef.__cpuid_t = ulong
-rbx.platform.typedef.__dev_t = ulong_long
-rbx.platform.typedef.__fd_mask = int
+rbx.platform.typedef.__cpulevel_t = int
+rbx.platform.typedef.__cpusetid_t = int
+rbx.platform.typedef.__cpuwhich_t = int
+rbx.platform.typedef.__critical_t = long
+rbx.platform.typedef.__ct_rune_t = int
+rbx.platform.typedef.__daddr_t = long
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__fd_mask = ulong
+rbx.platform.typedef.__fflags_t = uint
 rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
 rbx.platform.typedef.__gid_t = uint
-rbx.platform.typedef.__id_t = uint
-rbx.platform.typedef.__in_addr_t = uint
-rbx.platform.typedef.__in_port_t = ushort
-rbx.platform.typedef.__ino_t = ulong_long
+rbx.platform.typedef.__id_t = long
+rbx.platform.typedef.__ino_t = ulong
 rbx.platform.typedef.__int16_t = short
 rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int64_t = long
 rbx.platform.typedef.__int8_t = char
 rbx.platform.typedef.__int_fast16_t = int
 rbx.platform.typedef.__int_fast32_t = int
-rbx.platform.typedef.__int_fast64_t = long_long
+rbx.platform.typedef.__int_fast64_t = long
 rbx.platform.typedef.__int_fast8_t = int
 rbx.platform.typedef.__int_least16_t = short
 rbx.platform.typedef.__int_least32_t = int
-rbx.platform.typedef.__int_least64_t = long_long
+rbx.platform.typedef.__int_least64_t = long
 rbx.platform.typedef.__int_least8_t = char
-rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intfptr_t = long
+rbx.platform.typedef.__intmax_t = long
 rbx.platform.typedef.__intptr_t = long
 rbx.platform.typedef.__key_t = long
-rbx.platform.typedef.__mode_t = uint
-rbx.platform.typedef.__nlink_t = ulong_long
-rbx.platform.typedef.__off_t = long_long
-rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__lwpid_t = int
+rbx.platform.typedef.__mode_t = ushort
+rbx.platform.typedef.__nl_item = int
+rbx.platform.typedef.__nlink_t = ulong
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__off_t = long
 rbx.platform.typedef.__pid_t = int
-rbx.platform.typedef.__psize_t = ulong
 rbx.platform.typedef.__ptrdiff_t = long
-rbx.platform.typedef.__register_t = long_long
-rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__register_t = long
+rbx.platform.typedef.__rlim_t = long
+rbx.platform.typedef.__rman_res_t = ulong
 rbx.platform.typedef.__rune_t = int
 rbx.platform.typedef.__sa_family_t = uchar
-rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__segsz_t = long
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__suseconds_t = int
-rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
-rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__u_register_t = ulong
 rbx.platform.typedef.__uid_t = uint
 rbx.platform.typedef.__uint16_t = ushort
 rbx.platform.typedef.__uint32_t = uint
-rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__uint64_t = ulong
 rbx.platform.typedef.__uint8_t = uchar
 rbx.platform.typedef.__uint_fast16_t = uint
 rbx.platform.typedef.__uint_fast32_t = uint
-rbx.platform.typedef.__uint_fast64_t = ulong_long
+rbx.platform.typedef.__uint_fast64_t = ulong
 rbx.platform.typedef.__uint_fast8_t = uint
 rbx.platform.typedef.__uint_least16_t = ushort
 rbx.platform.typedef.__uint_least32_t = uint
-rbx.platform.typedef.__uint_least64_t = ulong_long
+rbx.platform.typedef.__uint_least64_t = ulong
 rbx.platform.typedef.__uint_least8_t = uchar
-rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintfptr_t = ulong
+rbx.platform.typedef.__uintmax_t = ulong
 rbx.platform.typedef.__uintptr_t = ulong
 rbx.platform.typedef.__useconds_t = uint
-rbx.platform.typedef.__vaddr_t = ulong
-rbx.platform.typedef.__vsize_t = ulong
-rbx.platform.typedef.__wchar_t = int
-rbx.platform.typedef.__wctrans_t = pointer
-rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__vm_offset_t = ulong
+rbx.platform.typedef.__vm_paddr_t = ulong
+rbx.platform.typedef.__vm_size_t = ulong
 rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.accmode_t = int
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.c_caddr_t = pointer
 rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.cap_ioctl_t = ulong
 rbx.platform.typedef.clock_t = int
 rbx.platform.typedef.clockid_t = int
-rbx.platform.typedef.cpuid_t = ulong
-rbx.platform.typedef.daddr32_t = int
-rbx.platform.typedef.daddr64_t = long_long
-rbx.platform.typedef.daddr_t = int
-rbx.platform.typedef.dev_t = ulong_long
+rbx.platform.typedef.cpulevel_t = int
+rbx.platform.typedef.cpusetid_t = int
+rbx.platform.typedef.cpuwhich_t = int
+rbx.platform.typedef.critical_t = long
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.fd_mask = ulong
+rbx.platform.typedef.fflags_t = uint
 rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
 rbx.platform.typedef.gid_t = uint
-rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.id_t = long
 rbx.platform.typedef.in_addr_t = uint
 rbx.platform.typedef.in_port_t = ushort
-rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.ino_t = ulong
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
-rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int64_t = long
 rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = int
+rbx.platform.typedef.int_fast32_t = int
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = int
+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.intmax_t = long
 rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = long
-rbx.platform.typedef.mode_t = uint
-rbx.platform.typedef.nlink_t = ulong_long
-rbx.platform.typedef.off_t = long_long
-rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.kpaddr_t = ulong
+rbx.platform.typedef.ksize_t = ulong
+rbx.platform.typedef.kssize_t = long
+rbx.platform.typedef.kvaddr_t = ulong
+rbx.platform.typedef.lwpid_t = int
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.nlink_t = ulong
+rbx.platform.typedef.off64_t = long
+rbx.platform.typedef.off_t = long
 rbx.platform.typedef.pid_t = int
-rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.pthread_key_t = int
+rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.qaddr_t = pointer
-rbx.platform.typedef.quad_t = long_long
-rbx.platform.typedef.register_t = long_long
-rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.quad_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = long
+rbx.platform.typedef.rman_res_t = ulong
+rbx.platform.typedef.rsize_t = ulong
+rbx.platform.typedef.rune_t = int
 rbx.platform.typedef.sa_family_t = uchar
-rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.sbintime_t = long
+rbx.platform.typedef.segsz_t = long
 rbx.platform.typedef.size_t = ulong
 rbx.platform.typedef.socklen_t = uint
 rbx.platform.typedef.ssize_t = long
-rbx.platform.typedef.suseconds_t = int
-rbx.platform.typedef.swblk_t = int
-rbx.platform.typedef.time_t = int
-rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
 rbx.platform.typedef.u_char = uchar
 rbx.platform.typedef.u_int = uint
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint
-rbx.platform.typedef.u_int64_t = ulong_long
+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_long
+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
 rbx.platform.typedef.uint16_t = ushort
 rbx.platform.typedef.uint32_t = uint
-rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint64_t = ulong
 rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = uint
+rbx.platform.typedef.uint_fast32_t = uint
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uint
+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.uintmax_t = ulong
 rbx.platform.typedef.uintptr_t = ulong
-rbx.platform.typedef.ulong = ulong
-rbx.platform.typedef.unchar = uchar
 rbx.platform.typedef.useconds_t = uint
 rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.vaddr_t = ulong
-rbx.platform.typedef.vsize_t = ulong
+rbx.platform.typedef.vm_offset_t = ulong
+rbx.platform.typedef.vm_ooffset_t = ulong
+rbx.platform.typedef.vm_paddr_t = ulong
+rbx.platform.typedef.vm_pindex_t = ulong
+rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.wchar_t = uint

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.15.1'
+  VERSION = '1.15.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake