From 01e208064d65a6654f1ea9d4a8bb969ce31cbb70 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 7 Jul 2023 11:39:13 -0300 Subject: [PATCH 01/17] revert libdir changes to test binary packages job --- r/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/configure b/r/configure index a0f75f8ddb5..8efe792ca71 100755 --- a/r/configure +++ b/r/configure @@ -288,7 +288,7 @@ set_pkg_vars_with_pc () { # If we don't have pkg-config, we can make some inferences set_pkg_vars_without_pc () { - LIB_DIR="$1/lib" + # LIB_DIR="$1/lib" PKG_CFLAGS="-I$1/include $PKG_CFLAGS" if grep -q "_GLIBCXX_USE_CXX11_ABI=0" "${LIB_DIR}/pkgconfig/arrow.pc"; then PKG_CFLAGS="${PKG_CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0" From 72687886e6afca1b3a53a632a7ce715ac0476eef Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 7 Jul 2023 13:05:00 -0300 Subject: [PATCH 02/17] just for fun --- r/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/configure b/r/configure index 8efe792ca71..827c5d93af0 100755 --- a/r/configure +++ b/r/configure @@ -280,7 +280,7 @@ set_pkg_vars () { # If we have pkg-config, it will tell us what libarrow needs set_pkg_vars_with_pc () { - LIB_DIR="`${PKG_CONFIG} --variable=libdir --silence-errors ${PKG_CONFIG_NAME}`" + # LIB_DIR="`${PKG_CONFIG} --variable=libdir --silence-errors ${PKG_CONFIG_NAME}`" PKG_CFLAGS="`${PKG_CONFIG} --cflags --silence-errors ${PKG_CONFIG_NAME}` $PKG_CFLAGS" PKG_LIBS=`${PKG_CONFIG} --libs-only-l --libs-only-other --silence-errors ${PKG_CONFIG_NAME}` PKG_DIRS=`${PKG_CONFIG} --libs-only-L --silence-errors ${PKG_CONFIG_NAME}` From 34f891fdf25492e7558b052060661ec887052416 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Fri, 7 Jul 2023 15:22:48 -0300 Subject: [PATCH 03/17] undo changes --- r/configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r/configure b/r/configure index 827c5d93af0..a0f75f8ddb5 100755 --- a/r/configure +++ b/r/configure @@ -280,7 +280,7 @@ set_pkg_vars () { # If we have pkg-config, it will tell us what libarrow needs set_pkg_vars_with_pc () { - # LIB_DIR="`${PKG_CONFIG} --variable=libdir --silence-errors ${PKG_CONFIG_NAME}`" + LIB_DIR="`${PKG_CONFIG} --variable=libdir --silence-errors ${PKG_CONFIG_NAME}`" PKG_CFLAGS="`${PKG_CONFIG} --cflags --silence-errors ${PKG_CONFIG_NAME}` $PKG_CFLAGS" PKG_LIBS=`${PKG_CONFIG} --libs-only-l --libs-only-other --silence-errors ${PKG_CONFIG_NAME}` PKG_DIRS=`${PKG_CONFIG} --libs-only-L --silence-errors ${PKG_CONFIG_NAME}` @@ -288,7 +288,7 @@ set_pkg_vars_with_pc () { # If we don't have pkg-config, we can make some inferences set_pkg_vars_without_pc () { - # LIB_DIR="$1/lib" + LIB_DIR="$1/lib" PKG_CFLAGS="-I$1/include $PKG_CFLAGS" if grep -q "_GLIBCXX_USE_CXX11_ABI=0" "${LIB_DIR}/pkgconfig/arrow.pc"; then PKG_CFLAGS="${PKG_CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0" From 2fc75c6a4b1558207b605c1aefda86456e17ee78 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Mon, 10 Jul 2023 11:43:56 -0300 Subject: [PATCH 04/17] try setting BREW env var --- r/configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/r/configure b/r/configure index a0f75f8ddb5..a89d9c672db 100755 --- a/r/configure +++ b/r/configure @@ -253,6 +253,10 @@ do_autobrew () { cp tools/autobrew . fi fi + + # Set BREW environment variable for cpp/cmake + export BREW=`pwd`/autobrew + if ! . autobrew; then echo "Failed to retrieve binary for ${PKG_BREW_NAME}" fi From 8c58e0c767f5ee1b22342f32a924fd609fb7fc31 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Tue, 11 Jul 2023 11:51:59 -0300 Subject: [PATCH 05/17] undo BREW env var --- r/configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/r/configure b/r/configure index a89d9c672db..22f78b7a786 100755 --- a/r/configure +++ b/r/configure @@ -254,9 +254,6 @@ do_autobrew () { fi fi - # Set BREW environment variable for cpp/cmake - export BREW=`pwd`/autobrew - if ! . autobrew; then echo "Failed to retrieve binary for ${PKG_BREW_NAME}" fi From 053b57bda8f5507654f38471ff6ebf52840d0f23 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Tue, 11 Jul 2023 12:23:42 -0300 Subject: [PATCH 06/17] 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 4586649d0c0..1a72bf54df5 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 a5194eea3f7..b47d0edfe0d 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 f1813098921..573a01eb284 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 From 4f5b662893259cd1befcf7e6cb1eea4959441a89 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 09:30:03 -0300 Subject: [PATCH 07/17] Update r/tools/autobrew Co-authored-by: Sutou Kouhei --- r/tools/autobrew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/tools/autobrew b/r/tools/autobrew index 573a01eb284..35ffebcab37 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 -lssl -lcrypto $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 From 27789935e588866acc22a92afdf7fd2da561f8d5 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 09:31:36 -0300 Subject: [PATCH 08/17] don't modify formula --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 - dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index 1a72bf54df5..4586649d0c0 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -38,7 +38,6 @@ 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 b47d0edfe0d..a5194eea3f7 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb @@ -35,7 +35,6 @@ 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" From 3ffbc73116490b9029ba63dd946903cf8a4b7f37 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 09:38:13 -0300 Subject: [PATCH 09/17] maybe better configure fix --- r/configure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/r/configure b/r/configure index 22f78b7a786..e0198773459 100755 --- a/r/configure +++ b/r/configure @@ -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. @@ -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 @@ -253,7 +253,6 @@ do_autobrew () { cp tools/autobrew . fi fi - if ! . autobrew; then echo "Failed to retrieve binary for ${PKG_BREW_NAME}" fi From 5e08d6bc856c51240f15e8fb994fd9eb0261ce25 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 10:17:50 -0300 Subject: [PATCH 10/17] maybe link -lcurl to the right SSL --- r/tools/autobrew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/tools/autobrew b/r/tools/autobrew index 35ffebcab37..573a01eb284 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 -lssl -lcrypto" +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 From c0fe845b1db3841df204b8359b7a9bdfc4e33718 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 11:31:33 -0300 Subject: [PATCH 11/17] attempt pin to openssl3 --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 + dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index 4586649d0c0..622699380dd 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@3" 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 a5194eea3f7..695f55cb705 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@3" depends_on "snappy" depends_on "thrift" depends_on "zstd" From e93b4ab06f91c84b2b508eaf1c90330e5d222c1a Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Wed, 12 Jul 2023 16:35:39 -0300 Subject: [PATCH 12/17] maybe back to working state --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 2 +- dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb | 2 +- r/tools/autobrew | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index 622699380dd..1a72bf54df5 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -38,7 +38,7 @@ class ApacheArrowStatic < Formula depends_on "aws-sdk-cpp-static" depends_on "brotli" depends_on "lz4" - depends_on "openssl@3" + 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 695f55cb705..b47d0edfe0d 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow.rb @@ -35,7 +35,7 @@ class ApacheArrow < Formula depends_on "aws-sdk-cpp" depends_on "brotli" depends_on "lz4" - depends_on "openssl@3" + 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 573a01eb284..35ffebcab37 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 -lssl -lcrypto $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 From 3913e0b5d6c76eb74b9c71c143da58d92f01d9f6 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Thu, 13 Jul 2023 10:16:18 -0300 Subject: [PATCH 13/17] Use openssl3 in apache-arrow-static --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 2 +- 1 file changed, 1 insertion(+), 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 1a72bf54df5..622699380dd 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -38,7 +38,7 @@ class ApacheArrowStatic < Formula depends_on "aws-sdk-cpp-static" depends_on "brotli" depends_on "lz4" - depends_on "openssl@1.1" + depends_on "openssl@3" depends_on "snappy" depends_on "thrift" depends_on "zstd" From a0232bf92b860c8a7cab5221e8330d8d951ca539 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Sat, 15 Jul 2023 14:09:02 -0300 Subject: [PATCH 14/17] try curl in apache-arrow-static --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb index 622699380dd..ea32e377360 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -39,6 +39,7 @@ class ApacheArrowStatic < Formula depends_on "brotli" depends_on "lz4" depends_on "openssl@3" + depends_on "curl" depends_on "snappy" depends_on "thrift" depends_on "zstd" From ae451eec0df7d39834de8a8f989c0c161acd5381 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Sat, 15 Jul 2023 15:13:09 -0300 Subject: [PATCH 15/17] revert curl --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 - 1 file changed, 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 ea32e377360..622699380dd 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -39,7 +39,6 @@ class ApacheArrowStatic < Formula depends_on "brotli" depends_on "lz4" depends_on "openssl@3" - depends_on "curl" depends_on "snappy" depends_on "thrift" depends_on "zstd" From 0043b1cc6990cf1092fc1702f770be7c3efab510 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Sun, 16 Jul 2023 14:31:37 -0300 Subject: [PATCH 16/17] remove explicit dependency --- dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb | 1 - 1 file changed, 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 622699380dd..4586649d0c0 100644 --- a/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb +++ b/dev/tasks/homebrew-formulae/autobrew/apache-arrow-static.rb @@ -38,7 +38,6 @@ class ApacheArrowStatic < Formula depends_on "aws-sdk-cpp-static" depends_on "brotli" depends_on "lz4" - depends_on "openssl@3" depends_on "snappy" depends_on "thrift" depends_on "zstd" From 73850ffd83a2861df5a6e21d5d675ef8fe13f583 Mon Sep 17 00:00:00 2001 From: Dewey Dunnington Date: Sun, 16 Jul 2023 19:08:56 -0300 Subject: [PATCH 17/17] fix trailing whitespace --- r/configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/r/configure b/r/configure index e0198773459..a0f75f8ddb5 100755 --- a/r/configure +++ b/r/configure @@ -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. @@ -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