archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 43077,43078: [Backport #8937]

Browse source 
* 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
This commit is contained in:
nagachika 2013-10-09 15:20:42 +00:00
parent 8b73cefeda
commit 6da62adef7
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Thu Oct 10 00:00:30 2013 Tanaka Akira <akr@fsij.org>
* lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local * lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local

3
test/dl/test_base.rb
View file

@ -33,6 +33,9 @@ when /darwin/
when /kfreebsd/ when /kfreebsd/
libc_so = "/lib/libc.so.0.1" libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.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/ when /bsd|dragonfly/
libc_so = "/usr/lib/libc.so" libc_so = "/usr/lib/libc.so"
libm_so = "/usr/lib/libm.so" libm_so = "/usr/lib/libm.so"

3
test/fiddle/helper.rb
View file

@ -34,6 +34,9 @@ when /darwin/
when /kfreebsd/ when /kfreebsd/
libc_so = "/lib/libc.so.0.1" libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.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/ when /bsd|dragonfly/
libc_so = "/usr/lib/libc.so" libc_so = "/usr/lib/libc.so"
libm_so = "/usr/lib/libm.so" libm_so = "/usr/lib/libm.so"

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-10-10" #define RUBY_RELEASE_DATE "2013-10-10"
#define RUBY_PATCHLEVEL 328 #define RUBY_PATCHLEVEL 329
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10