diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 15:20:42 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 15:20:42 +0000 |
| commit | 6da62adef7b05daab4ed9c2740a6471cc671942d (patch) | |
| tree | 13b9e5876fc6fc0a37e99ebb24a8cededfe1f590 | |
| parent | 8b73cefeda2181b64695ac14eb12f0d62a3f667d (diff) | |
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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/dl/test_base.rb | 3 | ||||
| -rw-r--r-- | test/fiddle/helper.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Thu Oct 10 00:17:56 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * 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 <akr@fsij.org> * 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" @@ -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 |