naruse	2014-01-15 11:29:58 +0900 (Wed, 15 Jan 2014)

  New Revision: 44602

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

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

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/dl/test_base.rb
    branches/ruby_2_1/test/dl/test_handle.rb
    branches/ruby_2_1/test/fiddle/helper.rb
    branches/ruby_2_1/test/fiddle/test_handle.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44601)
+++ ruby_2_1/version.h	(revision 44602)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-01-11"
-#define RUBY_PATCHLEVEL 5
+#define RUBY_RELEASE_DATE "2014-01-15"
+#define RUBY_PATCHLEVEL 6
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/fiddle/helper.rb
===================================================================
--- ruby_2_1/test/fiddle/helper.rb	(revision 44601)
+++ ruby_2_1/test/fiddle/helper.rb	(revision 44602)
@@ -40,6 +40,9 @@ when /gnu/	#GNU/Hurd https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/helper.rb#L40
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"
+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_1/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_1/test/fiddle/test_handle.rb	(revision 44601)
+++ ruby_2_1/test/fiddle/test_handle.rb	(revision 44602)
@@ -183,7 +183,7 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L183
       # 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 if defined?(Fiddle)
Index: ruby_2_1/test/dl/test_base.rb
===================================================================
--- ruby_2_1/test/dl/test_base.rb	(revision 44601)
+++ ruby_2_1/test/dl/test_base.rb	(revision 44602)
@@ -39,6 +39,9 @@ when /gnu/	#GNU/Hurd https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/dl/test_base.rb#L39
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"
+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_1/test/dl/test_handle.rb
===================================================================
--- ruby_2_1/test/dl/test_handle.rb	(revision 44601)
+++ ruby_2_1/test/dl/test_handle.rb	(revision 44602)
@@ -181,7 +181,7 @@ module DL https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44598-44600


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