diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-19 02:42:16 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-19 02:42:16 +0000 |
commit | 67964f299b671c9b29257c7a62000bfbadb4c556 (patch) | |
tree | 5c6ade3a088559d213091a907adfb2a5170527d1 | |
parent | 0687ed1e59130f905c440828df5005397f62a28c (diff) |
* ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/fiddle/extconf.rb | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Sun May 19 11:37:36 2013 Kazuki Tsujimoto <[email protected]> + + * ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure. + Sun May 19 10:38:50 2013 Akinori MUSHA <[email protected]> * misc/ruby-electric.el (ruby-electric-delete-backward-char): Use diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 9c7991ec44..2190aa907f 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -6,6 +6,7 @@ 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('.') }}) end |