kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* (lib/tmpdir.rb): Rescue LoadError on etc.so for miniruby.

Browse source 
Revert r45707, r45711, r45717.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-04-29 05:19:38 +00:00
parent 17a4a9b993
commit 07f2563745
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Apr 29 14:17:57 2014 Tanaka Akira <akr@fsij.org>
* (lib/tmpdir.rb): Rescue LoadError on etc.so for miniruby.
Revert r45707, r45711, r45717.
Tue Apr 29 12:50:02 2014 Tanaka Akira <akr@fsij.org> Tue Apr 29 12:50:02 2014 Tanaka Akira <akr@fsij.org>
* lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in * lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in

2
bootstraptest/test_io.rb
View file

@ -42,7 +42,6 @@ assert_finish 1, %q{
} }
assert_equal 'ok', %q{ assert_equal 'ok', %q{
$" << 'etc.so'
require 'tmpdir' require 'tmpdir'
begin begin
tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}" tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
@ -59,7 +58,6 @@ assert_equal 'ok', %q{
} }
assert_equal 'ok', %q{ assert_equal 'ok', %q{
$" << 'etc.so'
require 'tmpdir' require 'tmpdir'
begin begin
tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}" tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"

5
lib/mkmf.rb
View file

@ -528,11 +528,6 @@ MSG
def try_link0(src, opt="", *opts, &b) # :nodoc: def try_link0(src, opt="", *opts, &b) # :nodoc:
cmd = link_command("", opt) cmd = link_command("", opt)
if $universal if $universal
begin
require 'etc'
rescue LoadError
$" << 'etc.so'
end
require 'tmpdir' require 'tmpdir'
Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir| Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
begin begin

5
lib/tmpdir.rb
View file

@ -5,7 +5,10 @@
# #
require 'fileutils' require 'fileutils'
require 'etc.so' begin
require 'etc.so'
rescue LoadError # rescue LoadError for miniruby
end
class Dir class Dir