[arrow] branch master updated: ARROW-4289: [C++] Forward AR and RANLIB to thirdparty builds

[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 439c555  ARROW-4289: [C++] Forward AR and RANLIB to thirdparty builds
439c555 is described below

commit 439c555605d5999f79ac41a5c56299ce4d87510f
Author: Korn, Uwe <uwe.k...@blue-yonder.com>
AuthorDate: Mon Jan 21 08:08:29 2019 +0900

    ARROW-4289: [C++] Forward AR and RANLIB to thirdparty builds
    
    Author: Korn, Uwe <uwe.k...@blue-yonder.com>
    Author: Uwe L. Korn <uw...@xhochy.com>
    
    Closes #3428 from xhochy/ARROW-4289 and squashes the following commits:
    
    2aeb1e27 <Uwe L. Korn> Forward arguments with "$@"
    2882d4e9 <Korn, Uwe> ARROW-4289:  Forward AR and RANLIB to thirdparty builds
---
 cpp/build-support/build-lz4-lib.sh          | 4 ++--
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cpp/build-support/build-lz4-lib.sh 
b/cpp/build-support/build-lz4-lib.sh
index d336866..fa4c61b 100755
--- a/cpp/build-support/build-lz4-lib.sh
+++ b/cpp/build-support/build-lz4-lib.sh
@@ -19,7 +19,7 @@
 #
 export CFLAGS="${CFLAGS} -O3 -fPIC"
 if [ -z "$MAKELEVEL" ]; then
-  make -j4
+  make -j4 "$@"
 else
-  make
+  make "$@"
 fi
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index b33848f..e2ed70c 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -905,6 +905,8 @@ if (ARROW_WITH_SNAPPY)
                             
"-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_CXX_FLAGS}"
                             
"-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${EP_C_FLAGS}"
                             "-DCMAKE_C_FLAGS=${EP_C_FLAGS}"
+                            "-DCMAKE_AR=${CMAKE_AR}"
+                            "-DCMAKE_RANLIB=${CMAKE_RANLIB}"
                             "-DCMAKE_INSTALL_PREFIX=${SNAPPY_PREFIX}")
       set(SNAPPY_UPDATE_COMMAND ${CMAKE_COMMAND} -E copy
                         ${CMAKE_SOURCE_DIR}/cmake_modules/SnappyCMakeLists.txt
@@ -923,7 +925,7 @@ if (ARROW_WITH_SNAPPY)
         BUILD_BYPRODUCTS "${SNAPPY_STATIC_LIB}")
     else()
       ExternalProject_Add(snappy_ep
-        CONFIGURE_COMMAND ./configure --with-pic "--prefix=${SNAPPY_PREFIX}" 
${SNAPPY_CXXFLAGS}
+        CONFIGURE_COMMAND ./configure --with-pic "AR=${CMAKE_AR}" 
"RANLIB=${CMAKE_RANLIB}" "--prefix=${SNAPPY_PREFIX}" ${SNAPPY_CXXFLAGS}
         ${EP_LOG_OPTIONS}
         BUILD_IN_SOURCE 1
         BUILD_COMMAND ${MAKE}
@@ -1045,7 +1047,7 @@ if (ARROW_WITH_LZ4)
       set(LZ4_PATCH_COMMAND PATCH_COMMAND git --git-dir=. apply --verbose 
--whitespace=fix 
${CMAKE_SOURCE_DIR}/build-support/lz4_msbuild_gl_runtimelibrary_params.patch)
     else()
       set(LZ4_STATIC_LIB "${LZ4_BUILD_DIR}/lib/liblz4.a")
-      set(LZ4_BUILD_COMMAND BUILD_COMMAND 
${CMAKE_SOURCE_DIR}/build-support/build-lz4-lib.sh)
+      set(LZ4_BUILD_COMMAND BUILD_COMMAND 
${CMAKE_SOURCE_DIR}/build-support/build-lz4-lib.sh "AR=${CMAKE_AR}")
     endif()
 
     ExternalProject_Add(lz4_ep
@@ -1189,7 +1191,7 @@ if (ARROW_ORC OR ARROW_FLIGHT OR ARROW_GANDIVA)
     set (PROTOBUF_EXECUTABLE "${PROTOBUF_PREFIX}/bin/protoc")
 
     ExternalProject_Add(protobuf_ep
-      CONFIGURE_COMMAND "./configure" "--disable-shared" 
"--prefix=${PROTOBUF_PREFIX}" "CXXFLAGS=${EP_CXX_FLAGS}"
+      CONFIGURE_COMMAND "./configure" "AR=${CMAKE_AR}" 
"RANLIB=${CMAKE_RANLIB}" "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" 
"--disable-shared" "--prefix=${PROTOBUF_PREFIX}" "CXXFLAGS=${EP_CXX_FLAGS}"
       BUILD_IN_SOURCE 1
       URL ${PROTOBUF_SOURCE_URL}
       BUILD_BYPRODUCTS "${PROTOBUF_STATIC_LIB}" "${PROTOBUF_EXECUTABLE}"