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

ruby-changes:16369

From: mrkn <ko1@a...>
Date: Thu, 17 Jun 2010 17:40:00 +0900 (JST)
Subject: [ruby-changes:16369] Ruby:r28347 (ruby_1_9_2): * ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so", for the filename extension part of native libraries.

mrkn	2010-06-17 17:39:41 +0900 (Thu, 17 Jun 2010)

  New Revision: 28347

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

  Log:
    * ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so", for the filename extension part of native libraries.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/digest/sha2/lib/sha2.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28346)
+++ ruby_1_9_2/ChangeLog	(revision 28347)
@@ -1,5 +1,10 @@
-Thu Jun 17 17:30:00 2010  Kenta Murata <mrkn@m...>
+Thu Jun 17 17:32:00 2010  Kenta Murata  <mrkn@m...>
 
+	* ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so",
+	  for the filename extension part of native libraries.
+
+Thu Jun 17 17:30:00 2010  Kenta Murata  <mrkn@m...>
+
 	* ext/digest/sha2/extconf.rb: remove a check for uint64_t.
 
 Wed Jun 16 18:35:20 2010  Akinori MUSHA  <knu@i...>
Index: ruby_1_9_2/ext/digest/sha2/lib/sha2.rb
===================================================================
--- ruby_1_9_2/ext/digest/sha2/lib/sha2.rb	(revision 28346)
+++ ruby_1_9_2/ext/digest/sha2/lib/sha2.rb	(revision 28347)
@@ -10,7 +10,11 @@
 #   $Id$
 
 require 'digest'
-require 'digest/sha2.so'
+begin
+  require 'digest/sha2.so'
+rescue LoadError
+  require 'digest/sha2.bundle'
+end
 
 module Digest
   #

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

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