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

ruby-changes:28772

From: ktsj <ko1@a...>
Date: Sun, 19 May 2013 11:42:27 +0900 (JST)
Subject: [ruby-changes:28772] ktsj:r40824 (trunk): * ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.

ktsj	2013-05-19 11:42:16 +0900 (Sun, 19 May 2013)

  New Revision: 40824

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

  Log:
    * ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.

  Modified files:
    trunk/ChangeLog
    trunk/ext/fiddle/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40823)
+++ ChangeLog	(revision 40824)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun May 19 11:37:36 2013  Kazuki Tsujimoto  <kazuki@c...>
+
+	* ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.
+
 Sun May 19 10:38:50 2013  Akinori MUSHA  <knu@i...>
 
 	* misc/ruby-electric.el (ruby-electric-delete-backward-char): Use
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 40823)
+++ ext/fiddle/extconf.rb	(revision 40824)
@@ -6,6 +6,7 @@ dir_config 'libffi' https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L6
 
 pkg_config("libffi")
 if ver = pkg_config("libffi", "modversion")
+  ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
   $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }})
 end
 

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

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