Skip to content

Commit 736f045

Browse files
committed
Remove all remnants from unnecessary patch
1 parent eab1602 commit 736f045

File tree

3 files changed

+1
-204
lines changed

3 files changed

+1
-204
lines changed

ci/scripts/r_docker_configure.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ fi
7373

7474
# Install rsync for bundling cpp source and curl to make sure it is installed on all images,
7575
# cmake is now a listed sys req.
76-
# Install patch/git for applying patches to bundled dependencies via FetchContent.
77-
$PACKAGE_MANAGER install -y rsync cmake curl git patch
76+
$PACKAGE_MANAGER install -y rsync cmake curl
7877

7978
# Update clang version to latest available.
8079
# This is only for rhub/clang20. If we change the base image from rhub/clang20,

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3299,7 +3299,6 @@ function(build_crc32c_once)
32993299
set(CRC32C_BUILD_TESTS OFF)
33003300
set(CRC32C_BUILD_BENCHMARKS OFF)
33013301
set(CRC32C_USE_GLOG OFF)
3302-
#set(CRC32C_INSTALL OFF)
33033302
fetchcontent_makeavailable(crc32c)
33043303

33053304
if(CMAKE_VERSION VERSION_LESS 3.28)
@@ -3405,28 +3404,8 @@ function(build_google_cloud_cpp_storage)
34053404
# For now, force its inclusion from the underlying system or fail.
34063405
find_curl()
34073406

3408-
# Apply patch to add GOOGLE_CLOUD_CPP_ENABLE_INSTALL option so it does not install
3409-
# unconditionally when embedded via FetchContent. Otherwise, we would have to install
3410-
# dependecies like absl, crc32c, nlohmann_json, etc. which is not desirable.
3411-
#set(GOOGLE_CLOUD_CPP_PATCH_COMMAND)
3412-
#find_program(PATCH patch)
3413-
#if(PATCH)
3414-
# set(GOOGLE_CLOUD_CPP_PATCH_COMMAND
3415-
# ${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/google-cloud-cpp-disable-install.patch)
3416-
#else()
3417-
# find_program(GIT git)
3418-
# if(GIT)
3419-
# set(GOOGLE_CLOUD_CPP_PATCH_COMMAND
3420-
# ${GIT} apply ${CMAKE_CURRENT_LIST_DIR}/google-cloud-cpp-disable-install.patch)
3421-
# else()
3422-
# message(FATAL_ERROR "Building google-cloud-cpp from source requires either 'patch' or 'git' to be available"
3423-
# )
3424-
# endif()
3425-
#endif()
3426-
34273407
fetchcontent_declare(google_cloud_cpp
34283408
${FC_DECLARE_COMMON_OPTIONS}
3429-
#PATCH_COMMAND ${GOOGLE_CLOUD_CPP_PATCH_COMMAND}
34303409
URL ${google_cloud_cpp_storage_SOURCE_URL}
34313410
URL_HASH "SHA256=${ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM}")
34323411

cpp/cmake_modules/google-cloud-cpp-disable-install.patch

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)