Skip to content

Commit 934c18e

Browse files
koukszucs
authored andcommitted
ARROW-6462: [C++] Fix build error on CentOS 6 x86_64 with bundled double-conversion
Because ${prefix}/lib64 is used on CentOS 6 x86_64. Closes apache#5289 from kou/cpp-double-conversion-bundled-centos-6 and squashes the following commits: a6b5fdf <Sutou Kouhei> Fix build error on CentOS 6 x86_64 with bundled double-conversion Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
1 parent 1138b9b commit 934c18e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -628,14 +628,16 @@ macro(build_double_conversion)
628628
message(STATUS "Building double-conversion from source")
629629
set(DOUBLE_CONVERSION_PREFIX
630630
"${CMAKE_CURRENT_BINARY_DIR}/double-conversion_ep/src/double-conversion_ep")
631+
set(DOUBLE_CONVERSION_LIB_DIR "lib")
631632
set(double-conversion_INCLUDE_DIRS "${DOUBLE_CONVERSION_PREFIX}/include")
632633
set(
633634
DOUBLE_CONVERSION_STATIC_LIB
634-
"${DOUBLE_CONVERSION_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}double-conversion${CMAKE_STATIC_LIBRARY_SUFFIX}"
635+
"${DOUBLE_CONVERSION_PREFIX}/${DOUBLE_CONVERSION_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}double-conversion${CMAKE_STATIC_LIBRARY_SUFFIX}"
635636
)
636637

637638
set(DOUBLE_CONVERSION_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
638-
"-DCMAKE_INSTALL_PREFIX=${DOUBLE_CONVERSION_PREFIX}")
639+
"-DCMAKE_INSTALL_PREFIX=${DOUBLE_CONVERSION_PREFIX}"
640+
"-DCMAKE_INSTALL_LIBDIR=${DOUBLE_CONVERSION_LIB_DIR}")
639641

640642
externalproject_add(double-conversion_ep
641643
${EP_LOG_OPTIONS}
@@ -865,7 +867,7 @@ macro(build_brotli)
865867
"${BROTLI_PREFIX}/${BROTLI_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
866868
)
867869
set(BROTLI_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX}"
868-
-DCMAKE_INSTALL_LIBDIR=lib -DBUILD_SHARED_LIBS=OFF)
870+
-DCMAKE_INSTALL_LIBDIR=${BROTLI_LIB_DIR} -DBUILD_SHARED_LIBS=OFF)
869871

870872
externalproject_add(brotli_ep
871873
URL ${BROTLI_SOURCE_URL}

0 commit comments

Comments
 (0)