Skip to content

Commit

Permalink
Remove debug print
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Oct 5, 2022
1 parent d7e0371 commit 6be7d82
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
3 changes: 0 additions & 3 deletions dev/tasks/conda-recipes/r-arrow/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ export DISABLE_AUTOBREW=1
# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk
export ARROW_R_CXXFLAGS="${ARROW_R_CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"

env | sort
export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"

export ARROW_R_DEV=true

$R CMD INSTALL --build r/.
7 changes: 3 additions & 4 deletions r/configure
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
# INCLUDE_DIR and LIB_DIR manually via e.g:
# R CMD INSTALL --configure-vars='INCLUDE_DIR=/.../include LIB_DIR=/.../lib'

set -x

# Library settings
PKG_CONFIG_NAME="arrow"
PKG_DEB_NAME="(unsuppored)"
Expand Down Expand Up @@ -170,11 +168,12 @@ else

${R_HOME}/bin/Rscript tools/nixlibs.R $VERSION

LIB_DIR="$(pwd)/libarrow/arrow-${VERSION}/lib"
LIB_DIR="`pwd`/libarrow/arrow-${VERSION}/lib"
if [ -d "$LIB_DIR" ]; then
# Use pkg-config to do static linking of libarrow's dependencies
export PKG_CONFIG_PATH="${LIB_DIR}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
PKG_CONFIG="pkg-config"
# pkg-config on CentOS 7 doesn't have --define-prefix option.
if ${PKG_CONFIG} --help | grep -- --define-prefix >/dev/null 2>&1; then
# --define-prefix is for binary packages. Binary packages
# uses "/arrow/r/libarrow/dist" as prefix but it doesn't
Expand Down Expand Up @@ -210,7 +209,7 @@ CXX17FLAGS=`"${R_HOME}"/bin/R CMD config CXX17FLAGS`
CXX17STD=`"${R_HOME}"/bin/R CMD config CXX17STD`
CPPFLAGS=`"${R_HOME}"/bin/R CMD config CPPFLAGS`
TEST_CMD="${CXX17} ${CPPFLAGS} ${PKG_CFLAGS} ${CXX17FLAGS} ${CXX17STD} -xc++ -"
echo "#include $PKG_TEST_HEADER" | ${TEST_CMD} # >/dev/null 2>&1
echo "#include $PKG_TEST_HEADER" | ${TEST_CMD} >/dev/null 2>&1

if [ $? -eq 0 ]; then
# Check for features
Expand Down

0 comments on commit 6be7d82

Please sign in to comment.