You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by jo...@apache.org on 2021/05/15 05:37:01 UTC

[arrow] 02/05: ARROW-12601: [R][Packaging] Fix pkg-config check in r/configure

This is an automated email from the ASF dual-hosted git repository.

jorgecarleitao pushed a commit to branch maint-4.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit 3ed7fab9eb56a60e45a0de4374616a25c4091a17
Author: Ian Cook <ia...@gmail.com>
AuthorDate: Thu Apr 29 17:32:33 2021 -0400

    ARROW-12601: [R][Packaging] Fix pkg-config check in r/configure
    
    Fixes false positives in a check that pkg-config is installed
    
    Closes #10198 from ianmcook/ARROW-12601
    
    Authored-by: Ian Cook <ia...@gmail.com>
    Signed-off-by: Ian Cook <ia...@gmail.com>
---
 r/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r/configure b/r/configure
index f6c1013..2da2b9f 100755
--- a/r/configure
+++ b/r/configure
@@ -77,7 +77,7 @@ elif [ "$INCLUDE_DIR" ] && [ "$LIB_DIR" ]; then
 else
   # Use pkg-config if available and allowed
   pkg-config --version >/dev/null 2>&1
-  if [ "$ARROW_USE_PKG_CONFIG" != "false" ] && [ $? -eq 0 ]; then
+  if [ $? -eq 0 ] && [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then
     PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
     PKGCONFIG_LIBS=`pkg-config --libs-only-l --silence-errors ${PKG_CONFIG_NAME}`
     PKGCONFIG_DIRS=`pkg-config --libs-only-L --silence-errors ${PKG_CONFIG_NAME}`