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

GH-36456: [R] Link to correct version of OpenSSL when using autobrew #36551

Merged
merged 17 commits into from
Jul 16, 2023
Merged

GH-36456: [R] Link to correct version of OpenSSL when using autobrew #36551

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
01e2080
revert libdir changes to test binary packages job
paleolimbot Jul 7, 2023
7268788
just for fun
paleolimbot Jul 7, 2023
34f891f
undo changes
paleolimbot Jul 7, 2023
2fc75c6
try setting BREW env var
paleolimbot Jul 10, 2023
8c58e0c
undo BREW env var
paleolimbot Jul 11, 2023
053b57b
maybe use openssl from autobrew
paleolimbot Jul 11, 2023
4f5b662
Update r/tools/autobrew
paleolimbot Jul 12, 2023
2778993
don't modify formula
paleolimbot Jul 12, 2023
3ffbc73
maybe better configure fix
paleolimbot Jul 12, 2023
5e08d6b
maybe link -lcurl to the right SSL
paleolimbot Jul 12, 2023
c0fe845
attempt pin to openssl3
paleolimbot Jul 12, 2023
e93b4ab
maybe back to working state
paleolimbot Jul 12, 2023
3913e0b
Use openssl3 in apache-arrow-static
paleolimbot Jul 13, 2023
a0232bf
try curl in apache-arrow-static
paleolimbot Jul 15, 2023
ae451ee
revert curl
paleolimbot Jul 15, 2023
0043b1c
remove explicit dependency
paleolimbot Jul 16, 2023
73850ff
fix trailing whitespace
paleolimbot Jul 16, 2023
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
1 change: 1 addition & 0 deletions dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions r/configure
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you revert changes in this file?

Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
# Currently the configure script doesn't offer much to make this easy.
# If you expect to rebuild multiple times, you should set up a dev
# environment.
# * Installing a dev version as a regular developer.
# * Installing a dev version as a regular developer.
# The best way is to maintain your own cmake build and install it
# to a directory (not system) that you set as the env var
# $ARROW_HOME.
# $ARROW_HOME.
#
# For more information, see the various installation and developer vignettes.

Expand Down Expand Up @@ -177,7 +177,7 @@ find_arrow () {
else
PC_LIB_VERSION=`grep '^Version' ${_LIBARROW_FOUND}/lib/pkgconfig/arrow.pc | sed s/Version:\ //`
fi
# This is in an R script for convenience and testability.
# This is in an R script for convenience and testability.
# Success means the found C++ library is ok to use.
# Error means the versions don't line up and we shouldn't use it.
# More specific messaging to the user is in the R script
Expand Down
2 changes: 1 addition & 1 deletion r/tools/autobrew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading