Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prefer autoreconf command if exists #62

Closed
wants to merge 3 commits into from
Closed

Prefer autoreconf command if exists #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4518d7
`autoconf_command_args` should be an array
nobu Mar 14, 2021
c92ca0e
Include `autoconf_command_args` in `AUTOCONF` to `dist`
nobu Mar 14, 2021
ebb4be6
Prefer autoreconf command if exists
nobu Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion chkbuild/ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions start-rubyci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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$/
Expand Down Expand Up @@ -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)
Expand Down