This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new ed87a5b7f5 GH-36456: [R] Link to correct version of OpenSSL when using
autobrew (#36551)
ed87a5b7f5 is described below
commit ed87a5b7f5ee1081d5613532c28de8e687b8e397
Author: Dewey Dunnington <[email protected]>
AuthorDate: Sun Jul 16 19:10:29 2023 -0300
GH-36456: [R] Link to correct version of OpenSSL when using autobrew
(#36551)
### Rationale for this change
The r-binary-packages job (which uses autobrew) and the autobrew nightly
jobs are failing because they are linking to a different version of OpenSSL
than the package was built against. I believe this occurred because Arrow and
its dependencies are built against the autobrew headers which included openssl.
The `ssl` and `crypto` libraries weren't explicitly linked, so I think whatever
LibreSSL fork MacOS installs by default was getting linked. This was perhaps
compatible using the vers [...]
### What changes are included in this PR?
This PR explicitly adds OpenSSL 1.1 to the autobrew formulas and explicitly
adds `-lssl -lcrypto` to the PKG_LIBS (1.1 because that's what was in the
corresponding homebrew formula).
### Are these changes tested?
Existing nightly tests cover these changes.
### Are there any user-facing changes?
No.
* Closes: #36456
Lead-authored-by: Dewey Dunnington <[email protected]>
Co-authored-by: Dewey Dunnington <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Dewey Dunnington <[email protected]>
---
dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 1 +
r/tools/autobrew | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
index a5194eea3f..b47d0edfe0 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 "[email protected]"
depends_on "snappy"
depends_on "thrift"
depends_on "zstd"
diff --git a/r/tools/autobrew b/r/tools/autobrew
index f181309892..35ffebcab3 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 $AWS_LIBS -lssl -lcrypto"
PKG_DIRS="-L$BREWDIR/lib"
# Prevent CRAN builder from linking against old libs in /usr/local/lib
