nagachika	2014-01-19 21:17:53 +0900 (Sun, 19 Jan 2014)

  New Revision: 44655

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

  Log:
    merge revision(s) 44598,44599,44600:
    
    /usr/lib/libc.so is not symlink on FreeBSD 10

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/dl/test_base.rb
    branches/ruby_2_0_0/test/dl/test_handle.rb
    branches/ruby_2_0_0/test/fiddle/helper.rb
    branches/ruby_2_0_0/test/fiddle/test_handle.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44654)
+++ ruby_2_0_0/version.h	(revision 44655)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-01-12"
-#define RUBY_PATCHLEVEL 384
+#define RUBY_RELEASE_DATE "2014-01-19"
+#define RUBY_PATCHLEVEL 385
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/fiddle/helper.rb
===================================================================
--- ruby_2_0_0/test/fiddle/helper.rb	(revision 44654)
+++ ruby_2_0_0/test/fiddle/helper.rb	(revision 44655)
@@ -37,6 +37,9 @@ when /kfreebsd/ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/helper.rb#L37
 when /gnu/	#GNU/Hurd
   libc_so = "/lib/libc.so.0.3"
   libm_so = "/lib/libm.so.6"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
Index: ruby_2_0_0/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_0_0/test/fiddle/test_handle.rb	(revision 44654)
+++ ruby_2_0_0/test/fiddle/test_handle.rb	(revision 44655)
@@ -180,7 +180,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/test_handle.rb#L180
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy')
+      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end
Index: ruby_2_0_0/test/dl/test_base.rb
===================================================================
--- ruby_2_0_0/test/dl/test_base.rb	(revision 44654)
+++ ruby_2_0_0/test/dl/test_base.rb	(revision 44655)
@@ -36,6 +36,9 @@ when /kfreebsd/ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/dl/test_base.rb#L36
 when /gnu/	#GNU/Hurd
   libc_so = "/lib/libc.so.0.3"
   libm_so = "/lib/libm.so.6"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
Index: ruby_2_0_0/test/dl/test_handle.rb
===================================================================
--- ruby_2_0_0/test/dl/test_handle.rb	(revision 44654)
+++ ruby_2_0_0/test/dl/test_handle.rb	(revision 44655)
@@ -181,7 +181,7 @@ module DL https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/dl/test_handle.rb#L181
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      DL.dlopen("/usr/lib/libc.so").sym('strcpy')
+      DL.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44598-44600


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