kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.

Browse source 
On Debian/lenny, which is a "supported" platform, ffi.h is installed
  in /usr/include/i486-linux-gnu/.  This causes build error when using
  gcc whose target is not i486-linux-gnu.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-06-15 16:43:46 +00:00
parent 06ecaa4943
commit 3ccd6c0aab
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jun 16 01:38:40 2010 Yusuke Endoh <mame@tsg.ne.jp>
* ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
On Debian/lenny, which is a "supported" platform, ffi.h is installed
in /usr/include/i486-linux-gnu/. This causes build error when using
gcc whose target is not i486-linux-gnu.
Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp> Wed Jun 16 00:04:38 2010 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_io.rb (safe_4): does not use Timeout because * test/ruby/test_io.rb (safe_4): does not use Timeout because

3
ext/fiddle/extconf.rb
View file

@ -4,7 +4,8 @@ require 'mkmf'
dir_config 'libffi' dir_config 'libffi'
unless pkg_config("libffi") or have_header('ffi.h') pkg_config("libffi")
unless have_header('ffi.h')
if have_header('ffi/ffi.h') if have_header('ffi/ffi.h')
$defs.push(format('-DUSE_HEADER_HACKS')) $defs.push(format('-DUSE_HEADER_HACKS'))
else else