From 0ac29943cf2d9b160cb4298860309fd0e70099f8 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 23 Jul 2024 03:34:13 +0200 Subject: [PATCH] Revert "fix non pc link order" This reverts commit bb9dd912dc1a525100d2fd666385b1e7597d32af. --- r/configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/r/configure b/r/configure index 1bad59ad9d8d0..0882ee6719c4b 100755 --- a/r/configure +++ b/r/configure @@ -347,13 +347,6 @@ add_feature_flags () { # NOTE: parquet is assumed to have the same -L flag as arrow # so there is no need to add its location to PKG_DIRS fi - if arrow_built_with ARROW_ACERO; then - PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_ACERO" - PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-acero" - PKG_LIBS_FEATURES_WITHOUT_PC="-larrow_acero $PKG_LIBS_FEATURES_WITHOUT_PC" - # NOTE: arrow_acero is assumed to have the same -L flag as arrow - # so there is no need to add its location to PKG_DIRS - fi if arrow_built_with ARROW_DATASET; then PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_DATASET" PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-dataset" @@ -361,6 +354,13 @@ add_feature_flags () { # NOTE: arrow_dataset is assumed to have the same -L flag as arrow # so there is no need to add its location to PKG_DIRS fi + if arrow_built_with ARROW_ACERO; then + PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_ACERO" + PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-acero" + PKG_LIBS_FEATURES_WITHOUT_PC="-larrow_acero $PKG_LIBS_FEATURES_WITHOUT_PC" + # NOTE: arrow_acero is assumed to have the same -L flag as arrow + # so there is no need to add its location to PKG_DIRS + fi if arrow_built_with ARROW_SUBSTRAIT; then PKG_CFLAGS_FEATURES="$PKG_CFLAGS_FEATURES -DARROW_R_WITH_SUBSTRAIT" PKG_CONFIG_NAMES_FEATURES="$PKG_CONFIG_NAMES_FEATURES arrow-substrait"