Removed the related files for downloading with extlibs
This commit is contained in:
parent
19e4a4c624
commit
0b4352b91d
@ -18,23 +18,6 @@ end
|
|||||||
if yaml_source == true
|
if yaml_source == true
|
||||||
# search the latest libyaml source under $srcdir
|
# search the latest libyaml source under $srcdir
|
||||||
yaml_source = Dir.glob("#{$srcdir}/yaml{,-*}/").max_by {|n| File.basename(n).scan(/\d+/).map(&:to_i)}
|
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. Try manually installing libyaml?"
|
|
||||||
begin
|
|
||||||
require_relative '../../tool/extlibs.rb'
|
|
||||||
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-*/")
|
|
||||||
raise "libyaml not found" unless yaml_source
|
|
||||||
end
|
|
||||||
elsif yaml_source
|
elsif yaml_source
|
||||||
yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
|
yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user