arrow-cpp: 0.10.0 -> 0.11.0 (#48066)
* arrow-cpp: 0.10.0 -> 0.11.0 * arrow-cpp: enable testingwip/yesman
parent
045a4a4b72
commit
4ed993367f
@ -0,0 +1,43 @@ |
||||
diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -615,7 +615,7 @@ endif(UNIX)
|
||||
set(ARROW_LINK_LIBS)
|
||||
|
||||
# Libraries to link statically with libarrow.so
|
||||
-set(ARROW_STATIC_LINK_LIBS double-conversion)
|
||||
+set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET})
|
||||
|
||||
if (ARROW_WITH_BROTLI)
|
||||
SET(ARROW_STATIC_LINK_LIBS
|
||||
@@ -694,7 +694,7 @@ else ()
|
||||
set(ARROW_MIN_TEST_LIBS
|
||||
arrow_shared
|
||||
${ARROW_LINK_LIBS}
|
||||
- double-conversion
|
||||
+ ${DOUBLE_CONVERSION_TARGET}
|
||||
${BOOST_SYSTEM_LIBRARY}
|
||||
${BOOST_FILESYSTEM_LIBRARY}
|
||||
${BOOST_REGEX_LIBRARY}
|
||||
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
|
||||
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
||||
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
||||
@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "")
|
||||
set(DOUBLE_CONVERSION_VENDORED 1)
|
||||
else()
|
||||
find_package(double-conversion REQUIRED)
|
||||
+ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion)
|
||||
set(DOUBLE_CONVERSION_VENDORED 0)
|
||||
endif()
|
||||
|
||||
include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
||||
-ADD_THIRDPARTY_LIB(double-conversion
|
||||
- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
|
||||
|
||||
if (DOUBLE_CONVERSION_VENDORED)
|
||||
+ ADD_THIRDPARTY_LIB(double-conversion
|
||||
+ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB})
|
||||
+ set(DOUBLE_CONVERSION_TARGET double-conversion)
|
||||
add_dependencies(arrow_dependencies double-conversion_ep)
|
||||
endif()
|
||||
|
@ -1,39 +0,0 @@ |
||||
{ stdenv, symlinkJoin, fetchurl, arrow-cpp, boost, cmake, gtest, snappy, thrift, zlib }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
name = "parquet-cpp-${version}"; |
||||
version = "1.5.0"; |
||||
|
||||
src = fetchurl { |
||||
url = "https://github.com/apache/parquet-cpp/archive/apache-${name}.tar.gz"; |
||||
sha256 = "19nwqahc0igr0jfprbf2m86rmzz6zicw4z7b8z832wbsyc904wli"; |
||||
}; |
||||
|
||||
patches = [ ./api.patch ]; |
||||
|
||||
nativeBuildInputs = [ cmake ]; |
||||
buildInputs = [ boost ]; |
||||
|
||||
preConfigure = '' |
||||
substituteInPlace cmake_modules/FindThrift.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY |
||||
substituteInPlace cmake_modules/FindSnappy.cmake --replace CMAKE_STATIC_LIBRARY CMAKE_SHARED_LIBRARY |
||||
''; |
||||
|
||||
ARROW_HOME = arrow-cpp; |
||||
THRIFT_HOME = thrift; |
||||
GTEST_HOME = gtest; |
||||
SNAPPY_HOME = symlinkJoin { name="snappy-wrap"; paths = [ snappy snappy.dev ]; }; |
||||
ZLIB_HOME = symlinkJoin { name="zlib-wrap"; paths = [ zlib.dev zlib.static ]; }; |
||||
|
||||
cmakeFlags = [ |
||||
"-DPARQUET_BUILD_BENCHMARKS=OFF" |
||||
]; |
||||
|
||||
meta = { |
||||
description = "A C++ library to read and write the Apache Parquet columnar data format"; |
||||
homepage = http://parquet.apache.org; |
||||
license = stdenv.lib.licenses.asl20; |
||||
platforms = stdenv.lib.platforms.unix; |
||||
maintainers = with stdenv.lib.maintainers; [ veprbl ]; |
||||
}; |
||||
} |
Loading…
Reference in new issue