ngoto	2011-08-09 12:36:18 +0900 (Tue, 09 Aug 2011)

  New Revision: 32892

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

  Log:
    * test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
    * test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
      and libm version numbers for detecting default libc and libm.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/dl/test_base.rb
    branches/ruby_1_9_3/test/fiddle/helper.rb
    trunk/ChangeLog
    trunk/test/dl/test_base.rb
    trunk/test/fiddle/helper.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32891)
+++ ChangeLog	(revision 32892)
@@ -1,3 +1,10 @@
+Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@g...>
+
+	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
+
+	* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
+	  and libm version numbers for detecting default libc and libm.
+
 Tue Aug  9 09:18:04 2011  Eric Hodel  <drbrain@s...>
 
 	* ext/zlib/zlib.c (gzfile_wrap):  Document encoding options.
Index: test/fiddle/helper.rb
===================================================================
--- test/fiddle/helper.rb	(revision 32891)
+++ test/fiddle/helper.rb	(revision 32892)
@@ -38,6 +38,18 @@
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
+when /solaris/
+  libdir = '/lib'
+  case [0].pack('L!').size
+  when 4
+    # 32-bit ruby
+    libdir = '/lib' if File.directory? '/lib'
+  when 8
+    # 64-bit ruby
+    libdir = '/lib/64' if File.directory? '/lib/64'
+  end
+  libc_so = File.join(libdir, "libc.so")
+  libm_so = File.join(libdir, "libm.so")
 when /aix/
   pwd=Dir.pwd
   libc_so = libm_so = "#{pwd}/libaixdltest.so"
Index: test/dl/test_base.rb
===================================================================
--- test/dl/test_base.rb	(revision 32891)
+++ test/dl/test_base.rb	(revision 32892)
@@ -45,8 +45,8 @@
     # 64-bit ruby
     libdir = '/lib/64' if File.directory? '/lib/64'
   end
-  libc_so = File.join(libdir, "libc.so.6")
-  libm_so = File.join(libdir, "libm.so.6")
+  libc_so = File.join(libdir, "libc.so")
+  libm_so = File.join(libdir, "libm.so")
 when /aix/
   pwd=Dir.pwd
   libc_so = libm_so = "#{pwd}/libaixdltest.so"
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32891)
+++ ruby_1_9_3/ChangeLog	(revision 32892)
@@ -1,3 +1,10 @@
+Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@g...>
+
+	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
+
+	* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
+	  and libm version numbers for detecting default libc and libm.
+
 Tue Aug  9 10:49:52 2011  Igor Zubkov  <igor.zubkov@g...>
 
 	* array.c: Fix typo. https://github.com/ruby/ruby/pull/36
Index: ruby_1_9_3/test/fiddle/helper.rb
===================================================================
--- ruby_1_9_3/test/fiddle/helper.rb	(revision 32891)
+++ ruby_1_9_3/test/fiddle/helper.rb	(revision 32892)
@@ -38,6 +38,18 @@
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
+when /solaris/
+  libdir = '/lib'
+  case [0].pack('L!').size
+  when 4
+    # 32-bit ruby
+    libdir = '/lib' if File.directory? '/lib'
+  when 8
+    # 64-bit ruby
+    libdir = '/lib/64' if File.directory? '/lib/64'
+  end
+  libc_so = File.join(libdir, "libc.so")
+  libm_so = File.join(libdir, "libm.so")
 when /aix/
   pwd=Dir.pwd
   libc_so = libm_so = "#{pwd}/libaixdltest.so"
Index: ruby_1_9_3/test/dl/test_base.rb
===================================================================
--- ruby_1_9_3/test/dl/test_base.rb	(revision 32891)
+++ ruby_1_9_3/test/dl/test_base.rb	(revision 32892)
@@ -45,8 +45,8 @@
     # 64-bit ruby
     libdir = '/lib/64' if File.directory? '/lib/64'
   end
-  libc_so = File.join(libdir, "libc.so.6")
-  libm_so = File.join(libdir, "libm.so.6")
+  libc_so = File.join(libdir, "libc.so")
+  libm_so = File.join(libdir, "libm.so")
 when /aix/
   pwd=Dir.pwd
   libc_so = libm_so = "#{pwd}/libaixdltest.so"

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