Skip to content

Commit 4ed4bbb

Browse files
committed
Try installing patch/git for R bundled
1 parent 67bcadf commit 4ed4bbb

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

ci/scripts/r_docker_configure.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ 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-
$PACKAGE_MANAGER install -y rsync cmake curl
76+
# Install patch/git for applying patches to bundled dependencies via FetchContent.
77+
$PACKAGE_MANAGER install -y rsync cmake curl git patch
7778

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

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3401,21 +3401,18 @@ function(build_google_cloud_cpp_storage)
34013401
set(GOOGLE_CLOUD_CPP_PATCH_COMMAND)
34023402
find_program(PATCH patch)
34033403
if(PATCH)
3404-
list(APPEND
3405-
GOOGLE_CLOUD_CPP_PATCH_COMMAND
3406-
${PATCH}
3407-
-p1
3408-
-i)
3404+
set(GOOGLE_CLOUD_CPP_PATCH_COMMAND
3405+
${PATCH} -p1 -i ${CMAKE_CURRENT_LIST_DIR}/google-cloud-cpp-disable-install.patch)
34093406
else()
34103407
find_program(GIT git)
34113408
if(GIT)
3412-
list(APPEND GOOGLE_CLOUD_CPP_PATCH_COMMAND ${GIT} apply)
3409+
set(GOOGLE_CLOUD_CPP_PATCH_COMMAND
3410+
${GIT} apply ${CMAKE_CURRENT_LIST_DIR}/google-cloud-cpp-disable-install.patch)
3411+
else()
3412+
message(FATAL_ERROR "Building google-cloud-cpp from source requires either 'patch' or 'git' to be available"
3413+
)
34133414
endif()
34143415
endif()
3415-
if(GOOGLE_CLOUD_CPP_PATCH_COMMAND)
3416-
list(APPEND GOOGLE_CLOUD_CPP_PATCH_COMMAND
3417-
${CMAKE_CURRENT_LIST_DIR}/google-cloud-cpp-disable-install.patch)
3418-
endif()
34193416

34203417
fetchcontent_declare(google_cloud_cpp
34213418
${FC_DECLARE_COMMON_OPTIONS}

0 commit comments

Comments
 (0)