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

ruby-changes:18112

From: yugui <ko1@a...>
Date: Wed, 8 Dec 2010 17:27:10 +0900 (JST)
Subject: [ruby-changes:18112] Ruby:r30133 (ruby_1_9_2): merges r29691 from trunk into ruby_1_9_2.

yugui	2010-12-08 17:09:18 +0900 (Wed, 08 Dec 2010)

  New Revision: 30133

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

  Log:
    merges r29691 from trunk into ruby_1_9_2.
    --
    * ext/fiddle/extconf.rb: fixing ffi library location on windows.
      Thanks Usa! [ruby-core:32930]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/fiddle/extconf.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30132)
+++ ruby_1_9_2/ChangeLog	(revision 30133)
@@ -1,3 +1,8 @@
+Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@t...>
+
+	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
+	  Thanks Usa! [ruby-core:32930]
+
 Wed Nov  3 14:13:46 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
Index: ruby_1_9_2/ext/fiddle/extconf.rb
===================================================================
--- ruby_1_9_2/ext/fiddle/extconf.rb	(revision 30132)
+++ ruby_1_9_2/ext/fiddle/extconf.rb	(revision 30133)
@@ -13,7 +13,7 @@
   end
 end
 
-unless have_library('ffi')
+unless have_library('ffi') || have_library('libffi')
   abort "libffi is missing. Please install libffi."
 end
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30132)
+++ ruby_1_9_2/version.h	(revision 30133)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 87
+#define RUBY_PATCHLEVEL 88
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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

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