From 047bc6afcb085c736ad2b29d4b369e4e74963432 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Tue, 11 Jul 2023 12:23:42 -0300 Subject: [PATCH] maybe use openssl from autobrew --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 + dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 1 + r/tools/autobrew | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index c0df6a32175eb..b8a05399ddb20 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -38,6 +38,7 @@ class ApacheArrowStatic < Formula depends_on "aws-sdk-cpp-static" depends_on "brotli" depends_on "lz4" + depends_on "openssl@1.1" depends_on "snappy" depends_on "thrift" depends_on "zstd" diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb index c09436d777ae9..ab3644c924859 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb @@ -35,6 +35,7 @@ class ApacheArrow < Formula depends_on "aws-sdk-cpp" depends_on "brotli" depends_on "lz4" + depends_on "openssl@1.1" depends_on "snappy" depends_on "thrift" depends_on "zstd" diff --git a/r/tools/autobrew b/r/tools/autobrew index f181309892174..573a01eb284c8 100644 --- a/r/tools/autobrew +++ b/r/tools/autobrew @@ -62,7 +62,7 @@ fi # Hardcode this for my custom autobrew build rm -f $BREWDIR/lib/*.dylib AWS_LIBS="-laws-cpp-sdk-config -laws-cpp-sdk-transfer -laws-cpp-sdk-identity-management -laws-cpp-sdk-cognito-identity -laws-cpp-sdk-sts -laws-cpp-sdk-s3 -laws-cpp-sdk-core -laws-c-event-stream -laws-checksums -laws-c-common -laws-crt-cpp -laws-c-io -laws-c-s3 -laws-c-auth -laws-c-http -laws-c-cal -laws-c-compression -laws-c-mqtt -lpthread -lcurl" -PKG_LIBS="-lparquet -larrow_dataset -larrow_acero -larrow -larrow_bundled_dependencies -lthrift -lbrotlienc-static -lbrotlidec-static -lbrotlicommon-static -llz4 -lsnappy -lzstd $AWS_LIBS" +PKG_LIBS="-lparquet -larrow_dataset -larrow_acero -larrow -larrow_bundled_dependencies -lthrift -lbrotlienc-static -lbrotlidec-static -lbrotlicommon-static -llz4 -lsnappy -lzstd -lssl -lcrypto $AWS_LIBS" PKG_DIRS="-L$BREWDIR/lib" # Prevent CRAN builder from linking against old libs in /usr/local/lib