From 6da62adef7b05daab4ed9c2740a6471cc671942d Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 9 Oct 2013 15:20:42 +0000 Subject: [PATCH] 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@gmail.com). * test/fiddle/helper.rb: ditto. [Bug #8937][ruby-core:57311] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/dl/test_base.rb | 3 +++ test/fiddle/helper.rb | 3 +++ version.h | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d7481d08e9..a38cc1ad62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Oct 10 00:17:56 2013 KOSAKI Motohiro + + * test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd + correctly. Patch by Gabriele Giacone (1o5g4r8o@gmail.com). + [Bug #8937][ruby-core:57311] + * test/fiddle/helper.rb: ditto. + Thu Oct 10 00:00:30 2013 Tanaka Akira * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb index 90d44e6c9d..c0d91f9edb 100644 --- a/test/dl/test_base.rb +++ b/test/dl/test_base.rb @@ -33,6 +33,9 @@ when /darwin/ 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" diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index 209dedb6fc..e5cbecd1db 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -34,6 +34,9 @@ when /darwin/ 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" diff --git a/version.h b/version.h index 33902be1ea..08ced6d4cd 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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