nobu	2014-12-25 21:58:18 +0900 (Thu, 25 Dec 2014)

  New Revision: 49007

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

  Log:
    extconf.rb: libffi PIC objects
    
    * ext/fiddle/extconf.rb: make PIC objects if it will be linked as
      a shared object eventually.  [ruby-core:67128]

  Modified files:
    trunk/ChangeLog
    trunk/ext/fiddle/extconf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49006)
+++ ChangeLog	(revision 49007)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec 25 21:58:15 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
+	  a shared object eventually.  [ruby-core:67128]
+
 Thu Dec 25 19:01:13 2014  NAKAMURA Usaku  <usa@r...>
 
 	* ext/fiddle/win32/libffi-3.2.1-mswin.patch: support mswin32.
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 49006)
+++ ext/fiddle/extconf.rb	(revision 49007)
@@ -36,7 +36,7 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L36
   end
   libffi.include = "#{libffi.builddir}/include"
   libffi.lib = "#{libffi.builddir}/.libs"
-  libffi.a = "#{libffi.lib}/libffi.#{$LIBEXT}"
+  libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
   nowarn = CONFIG.merge("warnflags"=>"")
   libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
   ver = ver[/libffi-(.*)/, 1]
@@ -64,9 +64,10 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L64
   ld = RbConfig::CONFIG['LD']
   args.concat %W[
     --srcdir=#{libffi.srcdir}
-    --disable-shared --host=#{libffi.arch}
+    --host=#{libffi.arch}
     --enable-builddir=#{RUBY_PLATFORM}
   ]
+  args << ($enable_shared && !$static ? '--enable-shared' : '--enable-static')
   args << libffi.opt if libffi.opt
   args.concat %W[
       CC=#{cc} CFLAGS=#{libffi.cflags}

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