From d4518d7c42f160b6258f3db5f76dc33c9150f8bf Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 14 Mar 2021 10:50:28 +0900 Subject: [PATCH 1/3] `autoconf_command_args` should be an array --- start-rubyci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start-rubyci b/start-rubyci index c039b31..7cd987a 100755 --- a/start-rubyci +++ b/start-rubyci @@ -129,7 +129,7 @@ when 'tk2-243-31075', 'armv8b' arg[0].slice!(1,9) when 'arch' h[:autoconf_command] = 'autoreconf' - h[:autoconf_command_args] = '-i' + h[:autoconf_command_args] = ['-i'] h[:git_shallow_clone] = true # to stop "make dist" which does not work on autoreconf when 'archlinux' h[:configure_args_cc] = %w[CC=clang] @@ -170,7 +170,7 @@ when /\Aandroid\d+-/ # hardlink is not available for a normal user on Android def File.link(new, old); end h[:autoconf_command] = 'autoreconf' - h[:autoconf_command_args] = '-i' + h[:autoconf_command_args] = ['-i'] when /^solaris/ # F ENV["MAKE"] = "gmake" ENV["RUBY_TEST_TIMEOUT_SCALE"] = "10" if ChkBuild.nickname =~ /sunc$/ From c92ca0e19b658ce4b5280dd4767cb0d3c0ad8f5c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 14 Mar 2021 10:50:56 +0900 Subject: [PATCH 2/3] Include `autoconf_command_args` in `AUTOCONF` to `dist` --- chkbuild/ruby.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chkbuild/ruby.rb b/chkbuild/ruby.rb index 5b54f60..6ab35ec 100644 --- a/chkbuild/ruby.rb +++ b/chkbuild/ruby.rb @@ -739,7 +739,8 @@ def (ChkBuild::Ruby).build_proc(b) relname = "#{ruby_branch}@#{ruby_rev}" end if relname - b.make("dist", "RELNAME=#{relname}", "AUTOCONF=#{autoconf_command}") + autoconf = [autoconf_command, autoconf_command_args].join(' ').strip + b.make("dist", "RELNAME=#{relname}", "AUTOCONF=#{autoconf}") end } end From ebb4be6ed514c7e6b41aa8c7434405cef5445cca Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 14 Mar 2021 10:51:41 +0900 Subject: [PATCH 3/3] Prefer autoreconf command if exists --- start-rubyci | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-rubyci b/start-rubyci index 7cd987a..1360d8a 100755 --- a/start-rubyci +++ b/start-rubyci @@ -200,8 +200,15 @@ when "osx1013", "osx1015", "osx1100arm" h[:configure_args_with_openssl_dir] = %w[--with-openssl-dir=/opt/local] end +autoreconf_command = '/home/naruse/local/autoconf/bin/autoreconf' autoconf_command = '/home/naruse/local/autoconf/bin/autoconf' -h[:autoconf_command] = autoconf_command if File.exist?(autoconf_command) +case +when File.exist?(autoreconf_command) + h[:autoconf_command] = autoreconf_command + h[:autoconf_command_args] = ['-i'] +when File.exist?(autoconf_command) + h[:autoconf_command] = autoconf_command +end h[:configure_args] = ["--with-baseruby=#{RbConfig.ruby}"] ChkBuild::Ruby.def_target(*arg)