1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/psych] Try bundled libyaml source if pre-installed is unavailable

Browse Source 
https://github.com/ruby/psych/commit/f78e1dba89
This commit is contained in:
Nobuyoshi Nakada 2022-03-29 18:42:00 +09:00 committed by git
parent c8e1ae4db7
commit c67088dbae
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/psych/extconf.rb
View File

@ -7,7 +7,16 @@ if $mswin or $mingw or $cygwin
end end
yaml_source = with_config("libyaml-source-dir") || enable_config("bundled-libyaml", false) yaml_source = with_config("libyaml-source-dir") || enable_config("bundled-libyaml", false)
unless yaml_source # default to pre-installed libyaml
pkg_config('yaml-0.1')
dir_config('libyaml')
unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
yaml_source = true # fallback to the bundled source if exists
end
end
if yaml_source == true 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)} yaml_source = Dir.glob("#{$srcdir}/yaml{,-*}/").max_by {|n| File.basename(n).scan(/\d+/).map(&:to_i)}
unless yaml_source unless yaml_source
require_relative '../../tool/extlibs.rb' require_relative '../../tool/extlibs.rb'
@ -16,6 +25,7 @@ if yaml_source == true
raise "failed to download libyaml source" raise "failed to download libyaml source"
end end
yaml_source, = Dir.glob("#{$srcdir}/yaml-*/") yaml_source, = Dir.glob("#{$srcdir}/yaml-*/")
raise "libyaml not found" unless yaml_source
end 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]}
@ -41,12 +51,6 @@ if yaml_source
Logging.message("INCLFAG=#$INCLFAG\n") Logging.message("INCLFAG=#$INCLFAG\n")
libyaml = "#{yaml}/src/.libs/libyaml.#$LIBEXT" libyaml = "#{yaml}/src/.libs/libyaml.#$LIBEXT"
$LOCAL_LIBS.prepend("$(LIBYAML) ") $LOCAL_LIBS.prepend("$(LIBYAML) ")
else
pkg_config('yaml-0.1')
dir_config('libyaml')
unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
raise "libyaml not found"
end
end end
create_makefile 'psych' do |mk| create_makefile 'psych' do |mk|