You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2021/05/17 11:37:14 UTC
[arrow] 08/13: ARROW-12642: [R] LIBARROW_MINIMAL, LIBARROW_DOWNLOAD,
NOT_CRAN env vars should not be case-sensitive
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch maint-4.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git
commit a8912410b1d29487ed9899f6b58ac3564c36ca98
Author: Ian Cook <ia...@gmail.com>
AuthorDate: Wed May 5 11:38:06 2021 -0500
ARROW-12642: [R] LIBARROW_MINIMAL, LIBARROW_DOWNLOAD, NOT_CRAN env vars should not be case-sensitive
This makes the environment variables `LIBARROW_MINIMAL`, `LIBARROW_DOWNLOAD`, and `NOT_CRAN` case-insensitive
Closes #10252 from ianmcook/ARROW-12642
Authored-by: Ian Cook <ia...@gmail.com>
Signed-off-by: Jonathan Keane <jk...@gmail.com>
---
r/configure | 3 +++
r/inst/build_arrow_static.sh | 3 +++
2 files changed, 6 insertions(+)
diff --git a/r/configure b/r/configure
index 2da2b9f..aa7e7a8 100755
--- a/r/configure
+++ b/r/configure
@@ -38,6 +38,9 @@ ARROW_R_DEV=`echo $ARROW_R_DEV | tr '[:upper:]' '[:lower:]'`
FORCE_AUTOBREW=`echo $FORCE_AUTOBREW | tr '[:upper:]' '[:lower:]'`
FORCE_BUNDLED_BUILD=`echo $FORCE_BUNDLED_BUILD | tr '[:upper:]' '[:lower:]'`
ARROW_USE_PKG_CONFIG=`echo $ARROW_USE_PKG_CONFIG | tr '[:upper:]' '[:lower:]'`
+LIBARROW_MINIMAL=`echo $LIBARROW_MINIMAL | tr '[:upper:]' '[:lower:]'`
+LIBARROW_DOWNLOAD=`echo $LIBARROW_DOWNLOAD | tr '[:upper:]' '[:lower:]'`
+NOT_CRAN=`echo $NOT_CRAN | tr '[:upper:]' '[:lower:]'`
VERSION=`grep '^Version' DESCRIPTION | sed s/Version:\ //`
UNAME=`uname -s`
diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh
index 6fba5be..5ae615d 100755
--- a/r/inst/build_arrow_static.sh
+++ b/r/inst/build_arrow_static.sh
@@ -36,6 +36,9 @@ set -x
SOURCE_DIR="$(cd "${SOURCE_DIR}" && pwd)"
DEST_DIR="$(mkdir -p "${DEST_DIR}" && cd "${DEST_DIR}" && pwd)"
+# Make some env vars case-insensitive
+LIBARROW_MINIMAL=`echo $LIBARROW_MINIMAL | tr '[:upper:]' '[:lower:]'`
+
if [ "$LIBARROW_MINIMAL" = "false" ]; then
ARROW_DEFAULT_PARAM="ON"
else