Skip to content

Commit

Permalink
don't silence errors
Browse files Browse the repository at this point in the history
  • Loading branch information
assignUser committed Nov 28, 2023
1 parent d64051d commit ec3aee5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions r/configure
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ find_arrow () {
export PKG_CONFIG_PATH="${_LIBARROW_FOUND}/lib/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
elif [ "$ARROW_USE_PKG_CONFIG" != "false" ] && ${PKG_CONFIG} ${PKG_CONFIG_NAME}; then
# 2. Use pkg-config to find arrow on the system
_LIBARROW_FOUND="`${PKG_CONFIG} --variable=prefix --silence-errors ${PKG_CONFIG_NAME}`"
_LIBARROW_FOUND="`${PKG_CONFIG} --variable=prefix ${PKG_CONFIG_NAME}`"
echo "*** Trying Arrow C++ found by pkg-config: $_LIBARROW_FOUND"
else
_LIBARROW_FOUND="false"
Expand Down Expand Up @@ -293,15 +293,15 @@ set_pkg_vars () {

# If we have pkg-config, it will tell us what libarrow needs
set_lib_dir_with_pc () {
LIB_DIR="`${PKG_CONFIG} --variable=libdir --silence-errors ${PKG_CONFIG_NAME}`"
LIB_DIR="`${PKG_CONFIG} --variable=libdir ${PKG_CONFIG_NAME}`"
}
set_pkg_vars_with_pc () {
pkg_config_names="${PKG_CONFIG_NAME} ${PKG_CONFIG_NAMES_FEATURES}"
PKG_CFLAGS="`${PKG_CONFIG} --cflags --silence-errors ${pkg_config_names}` $PKG_CFLAGS"
PKG_CFLAGS="`${PKG_CONFIG} --cflags ${pkg_config_names}` $PKG_CFLAGS"
PKG_CFLAGS="$PKG_CFLAGS $PKG_CFLAGS_FEATURES"
PKG_LIBS=`${PKG_CONFIG} --libs-only-l --libs-only-other --silence-errors ${pkg_config_names}`
PKG_LIBS=`${PKG_CONFIG} --libs-only-l --libs-only-other ${pkg_config_names}`
PKG_LIBS="$PKG_LIBS $PKG_LIBS_FEATURES"
PKG_DIRS=`${PKG_CONFIG} --libs-only-L --silence-errors ${pkg_config_names}`
PKG_DIRS=`${PKG_CONFIG} --libs-only-L ${pkg_config_names}`
}

# If we don't have pkg-config, we can make some inferences
Expand Down

0 comments on commit ec3aee5

Please sign in to comment.