nagachika	2013-10-10 00:20:42 +0900 (Thu, 10 Oct 2013)

  New Revision: 43225

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

  Log:
    merge revision(s) 43077,43078: [Backport #8937]
    
    * test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
      correctly. Patch by Gabriele Giacone (1o5g4r8o@g...).
    
    * test/fiddle/helper.rb: ditto.
      [Bug #8937][ruby-core:57311]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/dl/test_base.rb
    branches/ruby_2_0_0/test/fiddle/helper.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43224)
+++ ruby_2_0_0/ChangeLog	(revision 43225)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Oct 10 00:17:56 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
+	  correctly. Patch by Gabriele Giacone (1o5g4r8o@g...).
+	  [Bug #8937][ruby-core:57311]
+	* test/fiddle/helper.rb: ditto.
+
 Thu Oct 10 00:00:30 2013  Tanaka Akira  <akr@f...>
 
 	* lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43224)
+++ ruby_2_0_0/version.h	(revision 43225)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-10-10"
-#define RUBY_PATCHLEVEL 328
+#define RUBY_PATCHLEVEL 329
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 10
Index: ruby_2_0_0/test/fiddle/helper.rb
===================================================================
--- ruby_2_0_0/test/fiddle/helper.rb	(revision 43224)
+++ ruby_2_0_0/test/fiddle/helper.rb	(revision 43225)
@@ -34,6 +34,9 @@ when /darwin/ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/fiddle/helper.rb#L34
 when /kfreebsd/
   libc_so = "/lib/libc.so.0.1"
   libm_so = "/lib/libm.so.1"
+when /gnu/	#GNU/Hurd
+  libc_so = "/lib/libc.so.0.3"
+  libm_so = "/lib/libm.so.6"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
Index: ruby_2_0_0/test/dl/test_base.rb
===================================================================
--- ruby_2_0_0/test/dl/test_base.rb	(revision 43224)
+++ ruby_2_0_0/test/dl/test_base.rb	(revision 43225)
@@ -33,6 +33,9 @@ when /darwin/ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/dl/test_base.rb#L33
 when /kfreebsd/
   libc_so = "/lib/libc.so.0.1"
   libm_so = "/lib/libm.so.1"
+when /gnu/	#GNU/Hurd
+  libc_so = "/lib/libc.so.0.3"
+  libm_so = "/lib/libm.so.6"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43077-43078


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