Skip to content

Commit

Permalink
databases/{,py-}pyarrow: update 13.0.0 → 15.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@yurivict
yurivict committed Mar 24, 2024
1 parent 086eaf1 commit 690aec1
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 612 deletions.
28 changes: 12 additions & 16 deletions databases/arrow/Makefile
View file
@@ -1,6 +1,5 @@
PORTNAME= arrow
DISTVERSION= 13.0.0
PORTREVISION= 6
DISTVERSION= 15.0.2
CATEGORIES= databases
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
https://github.com/apache/orc/archive/rel/:orc
Expand Down Expand Up @@ -32,16 +31,8 @@ CMAKE_OFF= ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD
OPTIONS_GROUP= COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
OPTIONS_GROUP_COMPRESSION= BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
OPTIONS_GROUP_COMPONENTS= ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
OPTIONS_DEFINE= UTF8PROC
OPTIONS_DEFAULT= UTF8PROC
OPTIONS_SUB= yes

## Miscellaneous options

UTF8PROC_DESC= Build with support for Unicode properties using the utf8proc library
UTF8PROC_CMAKE_BOOL= ARROW_WITH_UTF8PROC
UTF8PROC_LIB_DEPENDS= libutf8proc.so:textproc/utf8proc

## DESCs

COMPRESSION_DESC= Compression support:
Expand Down Expand Up @@ -75,7 +66,9 @@ ACERO_IMPLIES= COMPUTE IPC

COMPUTE_DESC= Arrow Compute Modules
COMPUTE_CMAKE_BOOL= ARROW_COMPUTE
COMPUTE_LIB_DEPENDS= libre2.so:devel/re2
COMPUTE_CMAKE_ON= -DARROW_WITH_UTF8PROC=ON
COMPUTE_LIB_DEPENDS= libre2.so:devel/re2 \
libutf8proc.so:textproc/utf8proc

CSV_DESC= Arrow CSV Parser Module
CSV_CMAKE_BOOL= ARROW_CSV
Expand All @@ -96,17 +89,17 @@ FLIGHT_LIB_DEPENDS= libgflags.so:devel/gflags \
libcares.so:dns/c-ares \
libgrpc.so:devel/grpc \
libre2.so:devel/re2
FLIGHT_IMPLIES= IPC
FLIGHT_IMPLIES= IPC COMPUTE # see https://github.com/apache/arrow/issues/40766
FLIGHT_BROKEN= configure breaks: Could not find a package configuration file provided by "re2"

GANDIVA_DESC= Gandiva libraries
GANDIVA_USES= ssl
GANDIVA_USES= llvm:17,lib ssl
GANDIVA_CMAKE_BOOL= ARROW_GANDIVA
GANDIVA_BUILD_DEPENDS= ${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12
GANDIVA_CMAKE_ON= -DARROW_WITH_UTF8PROC=ON
GANDIVA_LIB_DEPENDS= libgrpc.so:devel/grpc \
libprotobuf.so:devel/protobuf \
libre2.so:devel/re2
GANDIVA_IMPLIES= UTF8PROC
libre2.so:devel/re2 \
libutf8proc.so:textproc/utf8proc

HDFS_DESC= Arrow HDFS bridge
HDFS_CMAKE_BOOL= ARROW_HDFS
Expand Down Expand Up @@ -201,6 +194,9 @@ PLIST_FILES+= lib/cmake/Arrow/Findre2Alt.cmake
PLIST_FILES+= bin/arrow-file-to-stream \
bin/arrow-stream-to-file
.endif
.if ${PORT_OPTIONS:MGANDIVA} || ${PORT_OPTIONS:MCOMPUTE}
PLIST_FILES+= lib/cmake/Arrow/Findutf8proc.cmake
.endif

.if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
PLIST_SUB+= PYTHONFLIGHT=""
Expand Down
6 changes: 3 additions & 3 deletions databases/arrow/distinfo
View file
@@ -1,5 +1,5 @@
TIMESTAMP = 1693195096
SHA256 (apache-arrow-13.0.0.tar.gz) = 35dfda191262a756be934eef8afee8d09762cad25021daa626eb249e251ac9e6
SIZE (apache-arrow-13.0.0.tar.gz) = 20542669
TIMESTAMP = 1711166482
SHA256 (apache-arrow-15.0.2.tar.gz) = abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6
SIZE (apache-arrow-15.0.2.tar.gz) = 21503812
SHA256 (release-1.6.6.tar.gz) = 9a92b3eaad1d8b88a18cee41058feb34eb43d919df363e0b74a0b857724e4ba0
SIZE (release-1.6.6.tar.gz) = 13939853
6 changes: 3 additions & 3 deletions databases/arrow/files/patch-CMakeLists.txt
View file
@@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2023-08-17 08:05:04 UTC
--- CMakeLists.txt.orig 2024-03-13 13:37:59 UTC
+++ CMakeLists.txt
@@ -100,7 +100,7 @@ set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
@@ -124,7 +124,7 @@ include(CMakeParseArguments)

include(CMakePackageConfigHelpers)
include(CMakeParseArguments)
Expand All @@ -9,7 +9,7 @@
include(FindPackageHandleStandardArgs)

include(GNUInstallDirs)
@@ -968,9 +968,9 @@ if(ARROW_BUILD_EXAMPLES)
@@ -1010,9 +1010,9 @@ endif()
add_subdirectory(examples/arrow)
endif()

Expand Down
94 changes: 3 additions & 91 deletions databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
View file
@@ -1,102 +1,14 @@
--- cmake_modules/ThirdpartyToolchain.cmake.orig 2023-08-17 08:05:04 UTC
--- cmake_modules/ThirdpartyToolchain.cmake.orig 2024-03-13 13:37:59 UTC
+++ cmake_modules/ThirdpartyToolchain.cmake
@@ -16,6 +16,7 @@
@@ -16,6 +16,7 @@ include(ProcessorCount)
# under the License.

include(ProcessorCount)
+include(ExternalProject)
processorcount(NPROC)

add_custom_target(rapidjson)
@@ -2046,7 +2047,7 @@ macro(build_gtest)
string(APPEND GTEST_CMAKE_CXX_FLAGS " -DGTEST_CREATE_SHARED_LIBRARY=1")
endif()

- set(GTEST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix")
+ set(GTEST_PREFIX ${CMAKE_INSTALL_PREFIX})
set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")

set(_GTEST_LIBRARY_DIR "${GTEST_PREFIX}/lib")
@@ -2087,13 +2088,14 @@ macro(build_gtest)
list(APPEND GTEST_CMAKE_ARGS -Dgtest_force_shared_crt=ON)
endif()

- externalproject_add(googletest_ep
- ${EP_COMMON_OPTIONS}
- URL ${GTEST_SOURCE_URL}
- URL_HASH "SHA256=${ARROW_GTEST_BUILD_SHA256_CHECKSUM}"
- BUILD_BYPRODUCTS ${GTEST_SHARED_LIB} ${GTEST_MAIN_SHARED_LIB}
- ${GMOCK_SHARED_LIB}
- CMAKE_ARGS ${GTEST_CMAKE_ARGS})
+ #externalproject_add(googletest_ep
+ # ${EP_COMMON_OPTIONS}
+ # URL ${GTEST_SOURCE_URL}
+ # URL_HASH "SHA256=${ARROW_GTEST_BUILD_SHA256_CHECKSUM}"
+ # BUILD_BYPRODUCTS ${GTEST_SHARED_LIB} ${GTEST_MAIN_SHARED_LIB}
+ # ${GMOCK_SHARED_LIB}
+ # CMAKE_ARGS ${GTEST_CMAKE_ARGS})
+ find_package(GTest REQUIRED)
if(WIN32)
# Copy the built shared libraries to the same directory as our
# test programs because Windows doesn't provided rpath (run-time
@@ -2119,16 +2121,16 @@ macro(build_gtest)
else()
set(_GTEST_RUNTIME_OUTPUT_DIR ${BUILD_OUTPUT_ROOT_DIRECTORY})
endif()
- externalproject_add_step(googletest_ep copy
- COMMAND ${CMAKE_COMMAND} -E make_directory
- ${_GTEST_RUNTIME_OUTPUT_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_RUNTIME_LIB}
- ${_GTEST_RUNTIME_OUTPUT_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${_GMOCK_RUNTIME_LIB}
- ${_GTEST_RUNTIME_OUTPUT_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_MAIN_RUNTIME_LIB}
- ${_GTEST_RUNTIME_OUTPUT_DIR}
- DEPENDEES install)
+ #externalproject_add_step(googletest_ep copy
+ # COMMAND ${CMAKE_COMMAND} -E make_directory
+ # ${_GTEST_RUNTIME_OUTPUT_DIR}
+ # COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_RUNTIME_LIB}
+ # ${_GTEST_RUNTIME_OUTPUT_DIR}
+ # COMMAND ${CMAKE_COMMAND} -E copy ${_GMOCK_RUNTIME_LIB}
+ # ${_GTEST_RUNTIME_OUTPUT_DIR}
+ # COMMAND ${CMAKE_COMMAND} -E copy ${_GTEST_MAIN_RUNTIME_LIB}
+ # ${_GTEST_RUNTIME_OUTPUT_DIR}
+ # DEPENDEES install)
endif()

# The include directory must exist before it is referenced by a target.
@@ -2152,10 +2154,10 @@ macro(build_gtest)
INTERFACE_COMPILE_DEFINITIONS
"GMOCK_LINKED_AS_SHARED_LIBRARY=1"
INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}")
- add_dependencies(toolchain-tests googletest_ep)
- add_dependencies(arrow::GTest::gtest googletest_ep)
- add_dependencies(arrow::GTest::gtest_main googletest_ep)
- add_dependencies(arrow::GTest::gmock googletest_ep)
+ add_dependencies(toolchain-tests GTest::GTest)
+ add_dependencies(arrow::GTest::gtest GTest::GTest)
+ add_dependencies(arrow::GTest::gtest_main GTest::GTest)
+ add_dependencies(arrow::GTest::gmock GTest::GTest)
endmacro()

if(ARROW_TESTING)
@@ -2703,10 +2705,10 @@ macro(build_cares)
file(MAKE_DIRECTORY ${CARES_INCLUDE_DIR})

add_dependencies(toolchain cares_ep)
- add_library(c-ares::cares STATIC IMPORTED)
- set_target_properties(c-ares::cares
- PROPERTIES IMPORTED_LOCATION "${CARES_STATIC_LIB}"
- INTERFACE_INCLUDE_DIRECTORIES "${CARES_INCLUDE_DIR}")
+ # add_library(c-ares::cares STATIC IMPORTED)
+ # set_target_properties(c-ares::cares
+ # PROPERTIES IMPORTED_LOCATION "${CARES_STATIC_LIB}"
+ # INTERFACE_INCLUDE_DIRECTORIES "${CARES_INCLUDE_DIR}")
add_dependencies(c-ares::cares cares_ep)

if(APPLE)
@@ -5132,6 +5134,8 @@ if(ARROW_WITH_UCX)
@@ -5233,6 +5234,8 @@ message(STATUS "All bundled static libraries: ${ARROW_
endif()
message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")
Expand Down

0 comments on commit 690aec1

Please sign in to comment.