[arrow] branch master updated: ARROW-16570: [R] Make pkg-config commands find all of the libs

[kou]

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

kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new cb5c039a2c ARROW-16570: [R] Make pkg-config commands find all of the 
libs
cb5c039a2c is described below

commit cb5c039a2cd0fe791e3fbfc7935e8a397366d092
Author: Neal Richardson <neal.p.richard...@gmail.com>
AuthorDate: Wed May 18 05:54:27 2022 +0900

    ARROW-16570: [R] Make pkg-config commands find all of the libs
    
    See discussion at 
https://lists.apache.org/thread/7brfhv6mzc392jqo04o1jp5vos7g7lnj
    
    We don't currently have any CI that triggers the case @rvernica reported 
there.
    
    Closes #13151 from nealrichardson/r-pkg-libs
    
    Authored-by: Neal Richardson <neal.p.richard...@gmail.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 r/configure | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/r/configure b/r/configure
index 74ea965de5..30fa4bff1e 100755
--- a/r/configure
+++ b/r/configure
@@ -83,7 +83,8 @@ else
   if [ $? -eq 0 ] && [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then
     # Set the search paths and compile flags
     PKGCONFIG_CFLAGS=`pkg-config --cflags --silence-errors ${PKG_CONFIG_NAME}`
-    PKGCONFIG_LIBS=`pkg-config --libs-only-l --libs-only-other 
--silence-errors ${PKG_CONFIG_NAME}`
+    PKGCONFIG_LIBS=`pkg-config --libs-only-l --silence-errors 
${PKG_CONFIG_NAME}`
+    PKGCONFIG_LIBS="${PKGCONFIG_LIBS} `pkg-config --libs-only-other 
--silence-errors ${PKG_CONFIG_NAME}`"
     PKGCONFIG_DIRS=`pkg-config --libs-only-L --silence-errors 
${PKG_CONFIG_NAME}`
   fi
 
@@ -182,7 +183,8 @@ else
 
         # Use pkg-config to do static linking of libarrow's dependencies
         if [ "$ARROW_DEPENDENCY_SOURCE" = "AUTO" ] || [ 
"$ARROW_DEPENDENCY_SOURCE" = "SYSTEM" ]; then
-          PKG_LIBS="$PKG_LIBS `PKG_CONFIG_PATH=${LIB_DIR}/pkgconfig pkg-config 
--libs-only-l --libs-only-other --static  --silence-errors ${PKG_CONFIG_NAME}`"
+          PKG_LIBS="`PKG_CONFIG_PATH=${LIB_DIR}/pkgconfig pkg-config 
--libs-only-l --static  --silence-errors ${PKG_CONFIG_NAME}`"
+          PKG_LIBS="$PKG_LIBS `PKG_CONFIG_PATH=${LIB_DIR}/pkgconfig pkg-config 
--libs-only-other --static  --silence-errors ${PKG_CONFIG_NAME}`"
         fi
 
         # When using brew's openssl it is not bundled and it is not on the 
system