1 files changed, 40 insertions, 30 deletions
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 857f8e68c4..e7dd0bb60a 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,43 +1,53 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: true
 require 'mkmf'
-require 'fileutils'
 
-# :stopdoc:
-
-dir_config 'libyaml'
-
-if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_library('yaml', 'yaml_get_version'))
-  # Embed libyaml since we could not find it.
-
-  $VPATH << "$(srcdir)/yaml"
-  $INCFLAGS << " -I$(srcdir)/yaml"
-
-  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
+if $mswin or $mingw or $cygwin
+  $CPPFLAGS << " -DYAML_DECLARE_STATIC"
+end
 
-  header = 'yaml/yaml.h'
-  header = "{$(VPATH)}#{header}" if $nmake
-  if have_macro("_WIN32")
-    $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+yaml_source = with_config("libyaml-source-dir")
+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)
+    raise "Configure script not found in #{yaml_source.quote}"
   end
 
-  have_header 'dlfcn.h'
-  have_header 'inttypes.h'
-  have_header 'memory.h'
-  have_header 'stdint.h'
-  have_header 'stdlib.h'
-  have_header 'strings.h'
-  have_header 'string.h'
-  have_header 'sys/stat.h'
-  have_header 'sys/types.h'
-  have_header 'unistd.h'
-
-  find_header 'yaml.h'
-  have_header 'config.h'
+  puts("Configuring libyaml source in #{yaml_source.quote}")
+  yaml = "libyaml"
+  Dir.mkdir(yaml) unless File.directory?(yaml)
+  shared = $enable_shared || !$static
+  args = [
+    yaml_configure,
+    "--enable-#{shared ? 'shared' : 'static'}",
+    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-').sub(/arm64/, 'arm')}",
+    "CC=#{RbConfig::CONFIG['CC']}",
+    *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
+  ]
+  puts(args.quote.join(' '))
+  unless system(*args, chdir: yaml)
+    raise "failed to configure libyaml"
+  end
+  inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
+  $INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
+  puts("INCFLAGS=#$INCFLAGS")
+  libyaml = "libyaml.#$LIBEXT"
+  $cleanfiles << libyaml
+  $LOCAL_LIBS.prepend("$(LIBYAML) ")
+else # default to pre-installed libyaml
+  pkg_config('yaml-0.1')
+  dir_config('libyaml')
+  find_header('yaml.h') or abort "yaml.h not found"
+  find_library('yaml', 'yaml_get_version') or abort "libyaml not found"
 end
 
 create_makefile 'psych' do |mk|
-  mk << "YAML_H = #{header}".strip << "\n"
+  mk << "LIBYAML = #{libyaml}".strip << "\n"
+  mk << "LIBYAML_OBJDIR = libyaml/src#{shared ? '/.libs' : ''}\n"
+  mk << "OBJEXT = #$OBJEXT"
+  mk << "RANLIB = #{config_string('RANLIB') || config_string('NULLCMD')}\n"
 end
 
 # :startdoc: