ruby-changes:16355
From: mame <ko1@a...>
Date: Wed, 16 Jun 2010 01:44:05 +0900 (JST)
Subject: [ruby-changes:16355] Ruby:r28332 (trunk): * ext/fiddle/extconf.rb: check ffi.h even when pkg-config succeeded.
mame 2010-06-16 01:43:46 +0900 (Wed, 16 Jun 2010) New Revision: 28332 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28332 Log: * 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. Modified files: trunk/ChangeLog trunk/ext/fiddle/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 28331) +++ ChangeLog (revision 28332) @@ -1,3 +1,10 @@ +Wed Jun 16 01:38:40 2010 Yusuke Endoh <mame@t...> + + * 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@t...> * test/ruby/test_io.rb (safe_4): does not use Timeout because Index: ext/fiddle/extconf.rb =================================================================== --- ext/fiddle/extconf.rb (revision 28331) +++ ext/fiddle/extconf.rb (revision 28332) @@ -4,7 +4,8 @@ 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') $defs.push(format('-DUSE_HEADER_HACKS')) else -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/