nagachika	2014-06-30 01:59:36 +0900 (Mon, 30 Jun 2014)

  New Revision: 46609

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

  Log:
    merge revision(s) r46485: [Backport #9897]
    
    * ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
      with 3-digit.  libffi 3.1 returns just 2-digit.
      [ruby-core:62920] [Bug #9897]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/fiddle/extconf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46608)
+++ ruby_2_1/ChangeLog	(revision 46609)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Jun 30 01:46:19 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
+	  with 3-digit.  libffi 3.1 returns just 2-digit.
+	  [ruby-core:62920] [Bug #9897]
+
 Mon Jun 30 00:57:05 2014  Koichi Sasada  <ko1@a...>
 
 	* vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
Index: ruby_2_1/ext/fiddle/extconf.rb
===================================================================
--- ruby_2_1/ext/fiddle/extconf.rb	(revision 46608)
+++ ruby_2_1/ext/fiddle/extconf.rb	(revision 46609)
@@ -7,7 +7,8 @@ dir_config 'libffi' https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/fiddle/extconf.rb#L7
 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('.') }})
+  ver = (ver.split('.') + [0,0])[0,3]
+  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
 end
 
 unless have_header('ffi.h')
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46608)
+++ ruby_2_1/version.h	(revision 46609)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-30"
-#define RUBY_PATCHLEVEL 146
+#define RUBY_PATCHLEVEL 147
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46485


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