[前][次][番号順一覧][スレッド一覧]

ruby-changes:36845

From: nobu <ko1@a...>
Date: Tue, 23 Dec 2014 15:22:06 +0900 (JST)
Subject: [ruby-changes:36845] nobu:r48926 (trunk): extconf.rb: try modversion ff pkg_config succeeded

nobu	2014-12-23 15:22:00 +0900 (Tue, 23 Dec 2014)

  New Revision: 48926

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

  Log:
    extconf.rb: try modversion ff pkg_config succeeded
    
    * ext/fiddle/extconf.rb: when pkg_config failed, module version is
      not available.

  Modified files:
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 48925)
+++ ext/fiddle/extconf.rb	(revision 48926)
@@ -5,8 +5,8 @@ require 'mkmf' https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L5
 if ! enable_config('bundled-libffi', false)
   dir_config 'libffi'
 
-  pkg_config("libffi")
-  ver = pkg_config("libffi", "modversion")
+  pkg_config("libffi") and
+    ver = pkg_config("libffi", "modversion")
 
   if have_header(ffi_header = 'ffi.h')
     true

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

[前][次][番号順一覧][スレッド一覧]