From 817851803cfcf454916fb5221e6d1ee428af3d5f Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 29 Apr 2021 13:41:21 -0400 Subject: [PATCH 1/2] Add missing cflags for 4.0.0 --- apache-arrow | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apache-arrow b/apache-arrow index e3e68866f9..ad32333e39 100644 --- a/apache-arrow +++ b/apache-arrow @@ -33,8 +33,10 @@ PKG_LIBS="-lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrif PKG_DIRS="-L$BREWDIR/lib" if [ "$VERSION" = "3.0.0" ] || [ "$VERSION" = "2.0.0" ]; then PKG_LIBS="$PKG_DIRS $PKG_LIBS" + PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3" +else + PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3" fi -PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3" # Cleanup echo "rm -Rf .deps" >> cleanup From b527a09c25f70827713075fc47026d27a601fb2a Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 29 Apr 2021 14:02:33 -0400 Subject: [PATCH 2/2] Simplify --- apache-arrow | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apache-arrow b/apache-arrow index ad32333e39..bf0a54e5e1 100644 --- a/apache-arrow +++ b/apache-arrow @@ -33,10 +33,8 @@ PKG_LIBS="-lparquet -larrow_dataset -larrow -larrow_bundled_dependencies -lthrif PKG_DIRS="-L$BREWDIR/lib" if [ "$VERSION" = "3.0.0" ] || [ "$VERSION" = "2.0.0" ]; then PKG_LIBS="$PKG_DIRS $PKG_LIBS" - PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_S3" -else - PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3" fi +PKG_CFLAGS="-I$BREWDIR/include -DARROW_R_WITH_PARQUET -DARROW_R_WITH_DATASET -DARROW_R_WITH_S3" # Cleanup echo "rm -Rf .deps" >> cleanup