зеркало из https://github.com/github/ruby.git
fiddle/extconf.rb: supply 0
* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION with 3-digit. libffi 3.1 returns just 2-digit. [ruby-core:62920] [Bug #9897] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
28e88ce9a4
Коммит
ae8c770ba5
|
@ -1,3 +1,9 @@
|
|||
Sat Jun 21 12:50:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
|
||||
with 3-digit. libffi 3.1 returns just 2-digit.
|
||||
[ruby-core:62920] [Bug #9897]
|
||||
|
||||
Sat Jun 21 07:06:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* encoding.c (enc_find): [DOC] never accepted a symbol.
|
||||
|
|
|
@ -7,7 +7,8 @@ dir_config 'libffi'
|
|||
pkg_config("libffi")
|
||||
if ver = pkg_config("libffi", "modversion")
|
||||
ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
|
||||
$defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }})
|
||||
ver = (ver.split('.') + [0,0])[0,3]
|
||||
$defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
|
||||
end
|
||||
|
||||
unless have_header('ffi.h')
|
||||
|
|
Загрузка…
Ссылка в новой задаче