Skip to content

Commit 3e72985

Browse files
committed
MINOR: [C++] Bump Apache ORC to 2.2.1
1 parent e5c8ccd commit 3e72985

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4605,22 +4605,6 @@ function(build_orc)
46054605

46064606
message(STATUS "Building Apache ORC from source")
46074607

4608-
set(ORC_PATCHES)
4609-
if(MSVC)
4610-
# We can remove this once bundled Apache ORC is 2.2.1 or later.
4611-
list(APPEND ORC_PATCHES ${CMAKE_CURRENT_LIST_DIR}/orc-2345.patch)
4612-
endif()
4613-
if(Protobuf_VERSION VERSION_GREATER_EQUAL 32.0)
4614-
# We can remove this once bundled Apache ORC is 2.2.1 or later.
4615-
list(APPEND ORC_PATCHES ${CMAKE_CURRENT_LIST_DIR}/orc-2357.patch)
4616-
endif()
4617-
if(ORC_PATCHES)
4618-
find_program(PATCH patch REQUIRED)
4619-
set(ORC_PATCH_COMMAND ${PATCH} -p1 -i ${ORC_PATCHES})
4620-
else()
4621-
set(ORC_PATCH_COMMAND)
4622-
endif()
4623-
46244608
if(LZ4_VENDORED)
46254609
set(ORC_LZ4_TARGET lz4_static)
46264610
set(ORC_LZ4_ROOT "${lz4_SOURCE_DIR}")
@@ -4635,7 +4619,6 @@ function(build_orc)
46354619
if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
46364620
fetchcontent_declare(orc
46374621
${FC_DECLARE_COMMON_OPTIONS}
4638-
PATCH_COMMAND ${ORC_PATCH_COMMAND}
46394622
URL ${ORC_SOURCE_URL}
46404623
URL_HASH "SHA256=${ARROW_ORC_BUILD_SHA256_CHECKSUM}")
46414624
prepare_fetchcontent()
@@ -4763,7 +4746,6 @@ function(build_orc)
47634746
${Snappy_TARGET}
47644747
${ORC_LZ4_TARGET}
47654748
ZLIB::ZLIB
4766-
PATCH_COMMAND ${ORC_PATCH_COMMAND}
47674749
URL ${ORC_SOURCE_URL}
47684750
URL_HASH "SHA256=${ARROW_ORC_BUILD_SHA256_CHECKSUM}")
47694751
add_library(orc::orc STATIC IMPORTED)

cpp/thirdparty/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ ARROW_OPENTELEMETRY_BUILD_VERSION=v1.21.0
9090
ARROW_OPENTELEMETRY_BUILD_SHA256_CHECKSUM=98e5546f577a11b52a57faed1f4cc60d8c1daa44760eba393f43eab5a8ec46a2
9191
ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v1.7.0
9292
ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=11330d850f5e24d34c4246bc8cb21fcd311e7565d219195713455a576bb11bed
93-
ARROW_ORC_BUILD_VERSION=2.2.0
94-
ARROW_ORC_BUILD_SHA256_CHECKSUM=b15aca45a7e73ffbd1bbc36a78cd1422d41f07721092a25f43448e6e16f4763b
93+
ARROW_ORC_BUILD_VERSION=2.2.1
94+
ARROW_ORC_BUILD_SHA256_CHECKSUM=52fc762332442e8b05d7182f8c035f9e04d945b9a52be22ab69f28b3f37d4500
9595
ARROW_PROTOBUF_BUILD_VERSION=v21.3
9696
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=2f723218f6cb709ae4cdc4fb5ed56a5951fc5d466f0128ce4c946b8c78c8c49f
9797
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require

0 commit comments

Comments
 (0)