nobu	2015-03-13 11:37:49 +0900 (Fri, 13 Mar 2015)

  New Revision: 49957

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

  Log:
    libff: fix enable-shared condition
    
    * ext/fiddle/extconf.rb: needs --enable-shared when linked to
      libruby or fiddle.so.  since --with-static-linked-ext does no
      longer link extensions to ruby program with --enable-shared, the
      only combination needs --enable-static is --disable-shared and
      --with-static-linked-ext.  [ruby-dev:48901] [Bug #10960]

  Modified files:
    trunk/ChangeLog
    trunk/ext/fiddle/extconf.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49956)
+++ ChangeLog	(revision 49957)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Mar 13 11:37:46 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/fiddle/extconf.rb: needs --enable-shared when linked to
+	  libruby or fiddle.so.  since --with-static-linked-ext does no
+	  longer link extensions to ruby program with --enable-shared, the
+	  only combination needs --enable-static is --disable-shared and
+	  --with-static-linked-ext.  [ruby-dev:48901] [Bug #10960]
+
 Fri Mar 13 07:02:20 2015  Eric Wong  <e@8...>
 
 	* ext/socket/init.c (rsock_s_accept_nonblock): use rb_hash_lookup2
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 49956)
+++ ext/fiddle/extconf.rb	(revision 49957)
@@ -72,7 +72,7 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L72
     --host=#{libffi.arch}
     --enable-builddir=#{RUBY_PLATFORM}
   ]
-  args << ($enable_shared && !$static ? '--enable-shared' : '--enable-static')
+  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/