From e680e63e7ea79657e06d7c4609720c6ee06442b8 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 1 Apr 2022 00:45:31 +0900
Subject: [ruby/psych] Output libyaml configure log

https://github.com/ruby/psych/commit/c2e3c8579c
---
 ext/psych/extconf.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'ext/psych/extconf.rb')

diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 54aa730f44..ff8f61a450 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -31,6 +31,7 @@ elsif yaml_source
   yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
 end
 if yaml_source
+  yaml_source = yaml_source.chomp("/")
   yaml_configure = "#{File.expand_path(yaml_source)}/configure"
   unless File.exist?(yaml_configure)
     raise "Configure script not found in #{yaml_source.quote}"
@@ -40,17 +41,19 @@ if yaml_source
   yaml = "libyaml"
   Dir.mkdir(yaml) unless File.directory?(yaml)
   shared = $enable_shared || !$static
-  unless system(yaml_configure, "-q",
-                "--enable-#{shared ? 'shared' : 'static'}",
-                "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
-                *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
-                chdir: yaml)
+  args = [
+    yaml_configure,
+    "--enable-#{shared ? 'shared' : 'static'}",
+    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
+    *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
+  ]
+  puts(args.quote.join(' '))
+  unless system(*args, chdir: yaml)
     raise "failed to configure libyaml"
   end
-  Logging.message("libyaml configured\n")
   inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
   $INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
-  Logging.message("INCLFAG=#$INCLFAG\n")
+  puts("INCFLAGS=#$INCFLAGS")
   libyaml = "libyaml.#$LIBEXT"
   $cleanfiles << libyaml
   $LOCAL_LIBS.prepend("$(LIBYAML) ")
-- 
cgit v1.2.3