1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/fiddle] try bundled libffi by default

Browse Source 
If no installed libffi found, use bundled libffi unless explicitly
`--disable-bundled-libffi` option is given.
This commit is contained in:
Nobuyoshi Nakada 2020-06-28 00:57:37 +09:00
parent f2bcdc7283
commit c405a8d37a
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2020-06-28 02:03:18 +09:00 
Merged: https://github.com/ruby/ruby/pull/3265
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fiddle/extconf.rb
View File

@ -37,7 +37,7 @@ unless have_libffi
Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)} Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)}
extlibs.run(["--cache=#{cache_dir}", ext_dir]) extlibs.run(["--cache=#{cache_dir}", ext_dir])
end end
if bundle if bundle != false
libffi_package_name = Dir.glob("#{$srcdir}/libffi-*/") libffi_package_name = Dir.glob("#{$srcdir}/libffi-*/")
.map {|n| File.basename(n)} .map {|n| File.basename(n)}
.max_by {|n| n.scan(/\d+/).map(&:to_i)} .max_by {|n| n.scan(/\d+/).map(&:to_i)}