diff options
author | Alan Wu <XrXr@users.noreply.github.com> | 2022-06-14 12:05:33 -0400 |
---|---|---|
committer | git <svn-admin@ruby-lang.org> | 2022-06-15 01:05:51 +0900 |
commit | 9357e310fb420bab7092a665be7875272820e2a3 (patch) | |
tree | 8fa170b7a753086989e0713219ffd4c33caf7cc1 /ext/psych/extconf.rb | |
parent | 9f09397bfe6762bf19ef47b2f60988e49b80560d (diff) |
[ruby/psych] Fix libyaml download failure rescue under miniruby
I tried to build Ruby on a system without libyaml today and realized
that my attempt from <https://github.com/ruby/psych/pull/557> doesn't
fix the error in <https://github.com/ruby/psych/issues/552>. I still got
the same `LoadError` from `digest` which stopped the build.
Since `LoadError` is not a `StandardError`, a plain `rescue` doesn't catch
it. Catch `LoadError` explicitly instead and reduce the scope of the
`begin` block.
I tested this change in a Ruby build on macOS without libyaml installed
and confirmed that `make` continues with a warning instead of aborting:
*** Following extensions are not compiled:
psych:
Could not be configured. It will not be installed.
...
This should address <https://bugs.ruby-lang.org/issues/18790>.
https://github.com/ruby/psych/commit/251289ba83
Diffstat (limited to 'ext/psych/extconf.rb')
-rw-r--r-- | ext/psych/extconf.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index b9cd12033d..6d03870436 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -19,15 +19,17 @@ if yaml_source == true # search the latest libyaml source under $srcdir yaml_source = Dir.glob("#{$srcdir}/yaml{,-*}/").max_by {|n| File.basename(n).scan(/\d+/).map(&:to_i)} unless yaml_source - download_failure = "failed to download libyaml source" + download_failure = "failed to download libyaml source. Try manually installing libyaml?" begin require_relative '../../tool/extlibs.rb' - extlibs = ExtLibs.new(cache_dir: File.expand_path("../../tmp/download_cache", $srcdir)) - unless extlibs.process_under($srcdir) - raise download_failure - end - rescue - # Implicitly captures Exception#cause. Newer rubies show it in the backtrace. + rescue LoadError + # When running in ruby/ruby, we use miniruby and don't have stdlib. + # Avoid LoadError because it aborts the whole build. Usually when + # stdlib extension fail to configure we skip it and continue. + raise download_failure + end + extlibs = ExtLibs.new(cache_dir: File.expand_path("../../tmp/download_cache", $srcdir)) + unless extlibs.process_under($srcdir) raise download_failure end yaml_source, = Dir.glob("#{$srcdir}/yaml-*/") |