1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
ruby--ruby/tool
nobu ce8a8c101a Remove unnecessary require of fileutils
Today I updated my ruby core clone, and I run the usual steps to compile
ruby. When running "make", I run into the following error:

```
(... stuff ...)
encdb.h unchanged
Traceback (most recent call last):
	5: from ./tool/mkconfig.rb:19:in `<main>'
	4: from ./tool/mkconfig.rb:19:in `require'
	3: from /home/deivid/Code/ruby/lib/fileutils.rb:4:in `<top (required)>'
	2: from /home/deivid/Code/ruby/lib/fileutils.rb:4:in `require'
	1: from /home/deivid/Code/ruby/rbconfig.rb:11:in `<top (required)>'
/home/deivid/Code/ruby/rbconfig.rb:13:in `<module:RbConfig>': ruby lib version (2.5.0) doesn't match executable version (2.6.0) (RuntimeError)
uncommon.mk:780: recipe for target '.rbconfig.time' failed
make: *** [.rbconfig.time] Error 1
```

Apparently, the script that generates the root `rbconfig.rb` file requires
`fileutils`, which in turn requires 'rbconfig' (for mjit-headers it says in a
comment), which uses the `rbconfig.rb` config file in the root folder if it
exists. In my case, this file existed but had been generated on 2.5.0, thus
causing the error.

I think we can avoid this sort of circular dependency by not requiring
`fileutils`, since it does not seem to be used anywhere in the
`tool/mkconfig.rb` script since r55338.

[Fix GH-2045]

From: David Rodríguez <deivid.rodriguez@riseup.net>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-12-10 00:05:43 +00:00
..
m4 _colorize_result_prepare.m4: do not save CONFIGURE_TTY 2018-11-19 07:00:12 +00:00
ruby_vm Support targetting TracePoint [Feature #15289] 2018-11-26 18:16:39 +00:00
test
asm_parse.rb
bisect.sh
build-transcode
change_maker.rb
checksum.rb
colorize.rb
darwin-cc
downloader.rb tool/downloader.rb: retry Net::OpenTimeout 2018-12-01 00:37:54 +00:00
enc-emoji-citrus-gen.rb
enc-emoji4unicode.rb
enc-unicode.rb Embed the Emoji version 2018-11-27 06:44:02 +00:00
eval.rb
expand-config.rb
extlibs.rb
fake.rb Add RbConfig.fire_update! 2018-11-14 04:42:14 +00:00
fetch-bundled_gems.rb
file2lastrev.rb
gem-unpack.rb
gen_dummy_probes.rb
gen_ruby_tapset.rb
generate-backport-changelog.rb
generic_erb.rb
git-refresh
gperf.sed
id2token.rb
ifchange
insns2vm.rb
install-sh
jisx0208.rb
make-snapshot
make_hgraph.rb
mdoc2man.rb
merger.rb
mjit_archflag.sh mjit_archflag.sh: fix bare word in the header 2018-11-22 06:09:07 +00:00
mk_call_iseq_optimized.rb
mkconfig.rb Remove unnecessary require of fileutils 2018-12-10 00:05:43 +00:00
mkrunnable.rb
node_name.rb
parse.rb
prereq.status
probes_to_wiki.rb
rbinstall.rb Use stub executables generated by RubyGems istead of original executables. 2018-11-25 01:20:00 +00:00
rbuninstall.rb
redmine-backporter.rb
release.sh
rmdirs
run-gcov.rb
run-lcov.rb
runruby.rb
strip-rdoc.rb
sync_default_gems.rb Sync the executables of rdoc from upstream repository. 2018-11-26 12:23:45 +00:00
test-coverage.rb
transcode-tblgen.rb
transform_mjit_header.rb
update-deps update-deps: support coroutine dependencies 2018-12-03 13:12:34 +00:00
vcs.rb ChangeLog compatibility [ci skip] 2018-11-25 08:32:52 +00:00
vpath.rb
vtlh.rb
ytab.sed Fix for bison 3.2 [Bug #15284] 2018-11-11 12:40:40 +00:00