nobu	2015-07-27 12:45:11 +0900 (Mon, 27 Jul 2015)

  New Revision: 51401

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51401

  Log:
    fiddle: unexpand LIBFFI_DIR
    
    * ext/fiddle/extconf.rb: use LIBFFI_DIR instead of expanding it.

  Modified files:
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 51400)
+++ ext/fiddle/extconf.rb	(revision 51401)
@@ -140,7 +140,8 @@ types.each do |type, signed| https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L140
 end
 
 if libffi
-  $LOCAL_LIBS.prepend("./#{libffi.a} ").strip!
+  $LOCAL_LIBS.prepend("./$(LIBFFI_A) ").strip!
+  $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
 end
 create_makefile 'fiddle' do |conf|
   if !libffi
@@ -161,9 +162,9 @@ create_makefile 'fiddle' do |conf| https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L162
    PWD =
    LIBFFI_CONFIGURE = #{cmd}
    LIBFFI_ARCH = #{libffi.arch}
-   LIBFFI_SRCDIR = #{libffi.srcdir}
+   LIBFFI_SRCDIR = #{libffi.srcdir.sub(libffi.dir, '$(LIBFFI_DIR)')}
    LIBFFI_DIR = #{libffi.dir}
-   LIBFFI_A = #{libffi.a}
+   LIBFFI_A = #{libffi.a.sub(libffi.dir, '$(LIBFFI_DIR)')}
    LIBFFI_CFLAGS = #{libffi.cflags}
    LIBFFI_LDFLAGS = #{libffi.ldflags}
    FFI_H = $(LIBFFI_DIR)/include/ffi.h

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/