From 74ff9e5ece4a1a79f9176b7413f7cfc968c074ce Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 15 Apr 2021 17:08:32 -0400 Subject: [PATCH 1/3] Prepare for Apache Arrow 4.0.0 --- apache-arrow | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apache-arrow b/apache-arrow index ce69d9c339..e1cb710c5f 100644 --- a/apache-arrow +++ b/apache-arrow @@ -1,6 +1,6 @@ -# We have bundles for 2.0.0 and 3.0.0 now -if [ "$VERSION" != "2.0.0" ]; then -VERSION="3.0.0" +# We have bundles for 2.0.0, 3.0.0, and 4.0.0 now +if [ "$VERSION" != "3.0.0" ] && [ "$VERSION" != "2.0.0" ]; then + VERSION="4.0.0" fi # Find a bundle @@ -29,7 +29,11 @@ rm -f libs.tar.xz # Hardcoded flags 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 -lpthread -lcurl" -PKG_LIBS="-L$BREWDIR/lib -lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS" +PKG_LIBS="-lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS" +PKG_DIRS="-L$BREWDIR/lib" +if [ "$VERSION" = "3.0.0" ] || [ "$VERSION" = "2.0.0" ]; then + PKG_LIBS="$PKG_DIRS $PKG_LIBS" +fi PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3" # Cleanup From 253aa5118b6687456876f7af3acd7c037d9cd8b8 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Tue, 27 Apr 2021 01:34:02 +0200 Subject: [PATCH 2/3] Update apache-arrow --- apache-arrow | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apache-arrow b/apache-arrow index ce69d9c339..12106a2ee5 100644 --- a/apache-arrow +++ b/apache-arrow @@ -1,6 +1,6 @@ -# We have bundles for 2.0.0 and 3.0.0 now -if [ "$VERSION" != "2.0.0" ]; then -VERSION="3.0.0" +# We have bundles for 2.0.0 and 3.0.0 and 4.0.0 now +if [ "$VERSION" != "2.0.0" ] && [ "$VERSION" != "3.0.0" ]; then +VERSION="4.0.0" fi # Find a bundle From 7348650233a9864f6d2fc6be84ecbe005e47741a Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 15 Apr 2021 17:08:32 -0400 Subject: [PATCH 3/3] Prepare for Apache Arrow 4.0.0 --- apache-arrow | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apache-arrow b/apache-arrow index 12106a2ee5..e3e68866f9 100644 --- a/apache-arrow +++ b/apache-arrow @@ -29,7 +29,11 @@ rm -f libs.tar.xz # Hardcoded flags 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 -lpthread -lcurl" -PKG_LIBS="-L$BREWDIR/lib -lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS" +PKG_LIBS="-lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrift -llz4 -lsnappy -lzstd $AWS_LIBS" +PKG_DIRS="-L$BREWDIR/lib" +if [ "$VERSION" = "3.0.0" ] || [ "$VERSION" = "2.0.0" ]; then + PKG_LIBS="$PKG_DIRS $PKG_LIBS" +fi PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3" # Cleanup