[前][次][番号順一覧][スレッド一覧]

ruby-changes:73856

From: Hiroshi <ko1@a...>
Date: Wed, 5 Oct 2022 18:22:33 +0900 (JST)
Subject: [ruby-changes:73856] 0b4352b91d (master): Removed the related files for downloading with extlibs

https://git.ruby-lang.org/ruby.git/commit/?id=0b4352b91d

From 0b4352b91d067f0c31f749cc77025a856fc6b835 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Wed, 5 Oct 2022 17:35:09 +0900
Subject: Removed the related files for downloading with extlibs

---
 ext/psych/extconf.rb | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 6d03870436..16c76e4ca8 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -18,23 +18,6 @@ end https://github.com/ruby/ruby/blob/trunk/ext/psych/extconf.rb#L18
 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. 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
   yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
 end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]