(arrow) branch main updated: GH-49307: [Benchmarks] Revert rig-based R installation in benchmark hooks (#49308)

[thisisnic]

This is an automated email from the ASF dual-hosted git repository.

thisisnic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new c8e069ded8 GH-49307: [Benchmarks] Revert rig-based R installation in 
benchmark hooks (#49308)
c8e069ded8 is described below

commit c8e069ded81dad4b0759c6612dc38021b9895427
Author: Nic Crane <thisis...@gmail.com>
AuthorDate: Tue Feb 17 17:23:09 2026 +0000

    GH-49307: [Benchmarks] Revert rig-based R installation in benchmark hooks 
(#49308)
    
    ### Rationale for this change
    
    Broke the benchmarks experimenting with rig in #49038
    
    ### What changes are included in this PR?
    
    Revert rig installation for now
    
    ### Are these changes tested?
    
    Nope
    
    ### Are there any user-facing changes?
    
    Nope
    * GitHub Issue: #49307
    
    Authored-by: Nic Crane <thisis...@gmail.com>
    Signed-off-by: Nic Crane <thisis...@gmail.com>
---
 dev/conbench_envs/hooks.sh | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/dev/conbench_envs/hooks.sh b/dev/conbench_envs/hooks.sh
index a5c5750db9..5cf75a5c73 100755
--- a/dev/conbench_envs/hooks.sh
+++ b/dev/conbench_envs/hooks.sh
@@ -28,7 +28,8 @@ create_conda_env_for_benchmark_build() {
     --file ci/conda_env_unix.txt \
     compilers \
     python="${PYTHON_VERSION}" \
-    pandas
+    pandas \
+    r
 }
 
 activate_conda_env_for_benchmark_build() {
@@ -56,17 +57,27 @@ build_arrow_python() {
   ci/scripts/python_build.sh $(pwd) /tmp/arrow
 }
 
-install_r() {
-  if ! command -v R &> /dev/null; then
-    curl -Ls 
https://github.com/r-lib/rig/releases/download/latest/rig-linux-latest.tar.gz | 
sudo tar xz -C /usr/local
-    sudo rig add release
-    sudo rig default release
+build_arrow_r() {
+  cat ci/etc/rprofile >> $(R RHOME)/etc/Rprofile.site
+
+  # Ensure CXX20 is configured in R's Makeconf.
+  # conda-forge's R may have empty CXX20 entries even though the compiler 
supports it.
+  # Arrow requires C++20, so we need to add these settings if missing.
+  MAKECONF="$(R RHOME)/etc/Makeconf"
+  if [ -z "$(R CMD config CXX20)" ]; then
+    echo "*** CXX20 not configured in R, adding it to Makeconf"
+    cat >> "$MAKECONF" << 'EOF'
+
+# Added for Arrow C++20 support
+CXX20 = g++
+CXX20FLAGS = -g -O2 $(LTO)
+CXX20PICFLAGS = -fpic
+CXX20STD = -std=gnu++20
+SHLIB_CXX20LD = $(CXX20) $(CXX20STD)
+SHLIB_CXX20LDFLAGS = -shared
+EOF
   fi
-}
 
-build_arrow_r() {
-  install_r
-  cat ci/etc/rprofile | sudo tee -a $(R RHOME)/etc/Rprofile.site > /dev/null
   ci/scripts/r_deps.sh $(pwd) $(pwd)
   (cd r; R CMD INSTALL .;)
 }