ruby-changes:73893
From: Hiroshi <ko1@a...>
Date: Fri, 7 Oct 2022 12:55:50 +0900 (JST)
Subject: [ruby-changes:73893] fc218e5977 (master): [ruby/psych] Removed the related condition of --enable-bundled-libyaml
https://git.ruby-lang.org/ruby.git/commit/?id=fc218e5977 From fc218e597709e14634535c5836349f7f89a75dc2 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Fri, 7 Oct 2022 12:46:09 +0900 Subject: [ruby/psych] Removed the related condition of --enable-bundled-libyaml https://github.com/ruby/psych/commit/7c211a43c1 --- ext/psych/extconf.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index f20d9a259d..24173567b4 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -15,13 +15,8 @@ unless yaml_source # default to pre-installed libyaml https://github.com/ruby/ruby/blob/trunk/ext/psych/extconf.rb#L15 end end -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)} -elsif yaml_source - yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]} -end if yaml_source + yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]} yaml_source = yaml_source.chomp("/") yaml_configure = "#{File.expand_path(yaml_source)}/configure" unless File.exist?(yaml_configure) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/