Skip to content

Commit ae808e0

Browse files
committed
ARROW-14619: [Ruby] Use no @ openssl Homebrew package for pkg-config
Closes #11630 from kou/ruby-macos-openssl Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent b1c0aa3 commit ae808e0

2 files changed

Lines changed: 26 additions & 10 deletions

File tree

ruby/Rakefile

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,26 @@ Dir.glob("#{base_dir}/*/*.gemspec") do |gemspec|
3030
end
3131

3232
packages.each do |package|
33-
desc "Run test for #{package}"
34-
task package do
35-
cd(File.join(base_dir, package)) do
36-
if ENV["USE_BUNDLER"]
37-
sh("bundle", "exec", "rake")
38-
else
39-
ruby("-S", "rake")
33+
namespace package do
34+
desc "Run test for #{package}"
35+
task :test do
36+
cd(File.join(base_dir, package)) do
37+
if ENV["USE_BUNDLER"]
38+
sh("bundle", "exec", "rake", "test")
39+
else
40+
ruby("-S", "rake", "test")
41+
end
42+
end
43+
end
44+
45+
desc "Install #{package}"
46+
task :install do
47+
cd(File.join(base_dir, package)) do
48+
if ENV["USE_BUNDLER"]
49+
sh("bundle", "exec", "rake", "install")
50+
else
51+
ruby("-S", "rake", "install")
52+
end
4053
end
4154
end
4255
end
@@ -51,6 +64,9 @@ sorted_packages = packages.sort_by do |package|
5164
end
5265

5366
desc "Run test for all packages"
54-
task all: sorted_packages
67+
task test: sorted_packages.collect {|package| "#{package}:test"}
68+
69+
desc "Install all packages"
70+
task install: sorted_packages.collect {|package| "#{package}:install"}
5571

56-
task default: :all
72+
task default: :test

ruby/red-arrow/ext/arrow/extconf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
checking_for(checking_message("Homebrew")) do
2929
platform = NativePackageInstaller::Platform.detect
3030
if platform.is_a?(NativePackageInstaller::Platform::Homebrew)
31-
openssl_prefix = `brew --prefix openssl@1.1`.chomp
31+
openssl_prefix = `brew --prefix openssl`.chomp
3232
unless openssl_prefix.empty?
3333
PKGConfig.add_path("#{openssl_prefix}/lib/pkgconfig")
3434
end

0 commit comments

Comments
 (0)