diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 14:13:40 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-31 14:13:40 +0000 |
| commit | 559ea4702023fedaa40787641d41f99115f9418b (patch) | |
| tree | b8953f815834a2a12dba9fbdaa6a1a189d4b6be2 | |
| parent | 53293d3c627ac25ff2978859dabeaca14a6fe7b7 (diff) | |
merge revision(s) 43077,43078: [Backport #8999]
* 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_1_9_3@43484 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 31 23:10:30 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 31 23:05:33 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 0642f0ed89..63dee050d9 100644 --- a/test/dl/test_base.rb +++ b/test/dl/test_base.rb @@ -32,6 +32,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 ad69f55e69..9a46709693 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -38,6 +38,9 @@ when /kfreebsd/ when /bsd|dragonfly/ libc_so = "/usr/lib/libc.so" libm_so = "/usr/lib/libm.so" +when /gnu/ #GNU/Hurd + libc_so = "/lib/libc.so.0.3" + libm_so = "/lib/libm.so.6" when /solaris/ libdir = '/lib' case [0].pack('L!').size @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 472 +#define RUBY_PATCHLEVEL 473 #define RUBY_RELEASE_DATE "2013-10-31" #define RUBY_RELEASE_YEAR 2013 |