[ruby/psych] Output libyaml configure log
https://github.com/ruby/psych/commit/c2e3c8579c
This commit is contained in:
parent
2222032979
commit
e680e63e7e
|
@ -31,6 +31,7 @@ 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
|
||||||
if yaml_source
|
if yaml_source
|
||||||
|
yaml_source = yaml_source.chomp("/")
|
||||||
yaml_configure = "#{File.expand_path(yaml_source)}/configure"
|
yaml_configure = "#{File.expand_path(yaml_source)}/configure"
|
||||||
unless File.exist?(yaml_configure)
|
unless File.exist?(yaml_configure)
|
||||||
raise "Configure script not found in #{yaml_source.quote}"
|
raise "Configure script not found in #{yaml_source.quote}"
|
||||||
|
@ -40,17 +41,19 @@ if yaml_source
|
||||||
yaml = "libyaml"
|
yaml = "libyaml"
|
||||||
Dir.mkdir(yaml) unless File.directory?(yaml)
|
Dir.mkdir(yaml) unless File.directory?(yaml)
|
||||||
shared = $enable_shared || !$static
|
shared = $enable_shared || !$static
|
||||||
unless system(yaml_configure, "-q",
|
args = [
|
||||||
"--enable-#{shared ? 'shared' : 'static'}",
|
yaml_configure,
|
||||||
"--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
|
"--enable-#{shared ? 'shared' : 'static'}",
|
||||||
*(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
|
"--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
|
||||||
chdir: yaml)
|
*(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
|
||||||
|
]
|
||||||
|
puts(args.quote.join(' '))
|
||||||
|
unless system(*args, chdir: yaml)
|
||||||
raise "failed to configure libyaml"
|
raise "failed to configure libyaml"
|
||||||
end
|
end
|
||||||
Logging.message("libyaml configured\n")
|
|
||||||
inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
|
inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
|
||||||
$INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
|
$INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
|
||||||
Logging.message("INCLFAG=#$INCLFAG\n")
|
puts("INCFLAGS=#$INCFLAGS")
|
||||||
libyaml = "libyaml.#$LIBEXT"
|
libyaml = "libyaml.#$LIBEXT"
|
||||||
$cleanfiles << libyaml
|
$cleanfiles << libyaml
|
||||||
$LOCAL_LIBS.prepend("$(LIBYAML) ")
|
$LOCAL_LIBS.prepend("$(LIBYAML) ")
|
||||||
|
|
Loading…
Reference in New Issue