diff --git a/dev/tasks/conda-recipes/build_steps.sh b/dev/tasks/conda-recipes/build_steps.sh index ea607763fc5..b6bd1770c15 100755 --- a/dev/tasks/conda-recipes/build_steps.sh +++ b/dev/tasks/conda-recipes/build_steps.sh @@ -10,18 +10,19 @@ # benefit from the improvement. set -xeuo pipefail +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" output_dir=${1} export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc </dev/null && pwd )" ARROW_ROOT=$(cd "$THISDIR/../../.."; pwd;) FEEDSTOCK_ROOT=$THISDIR +RECIPE_ROOT=$THISDIR docker info @@ -64,6 +65,7 @@ docker run ${DOCKER_RUN_ARGS} \ -v "${ARROW_ROOT}":/arrow:rw,z \ -v "${build_dir}":/build:rw \ -e FEEDSTOCK_ROOT="/arrow/dev/tasks/conda-recipes" \ + -e RECIPE_ROOT="/arrow/dev/tasks/conda-recipes" \ -e CONFIG \ -e R_CONFIG \ -e HOST_USER_ID \ diff --git a/r/configure b/r/configure index 3f5f743fc08..0b23847b59c 100755 --- a/r/configure +++ b/r/configure @@ -104,7 +104,7 @@ else PKGCONFIG_DIRS=`pkg-config --libs-only-L --silence-errors ${PKG_CONFIG_NAME}` fi - if [ "$PKGCONFIG_CFLAGS" ] && [ "$PKGCONFIG_LIBS" ]; then + if [ "$PKGCONFIG_LIBS" != "" ]; then FOUND_LIB_DIR=`echo $PKGCONFIG_DIRS | sed -e 's/^-L//'` echo "*** Arrow C++ libraries found via pkg-config at $FOUND_LIB_DIR" PKG_CFLAGS="$PKGCONFIG_CFLAGS $PKG_CFLAGS"