From 3ccd6c0aab516bb1ca8402b985db83a90dbd0eb2 Mon Sep 17 00:00:00 2001 From: mame Date: Tue, 15 Jun 2010 16:43:46 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/fiddle/extconf.rb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c2af39703e..7ba17784b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 16 01:38:40 2010 Yusuke Endoh + + * 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 * test/ruby/test_io.rb (safe_4): does not use Timeout because diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index c80a1f9a83..dcc2c43cfd 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -4,7 +4,8 @@ require 'mkmf' 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