From 3841a76096d3c74a085fd6c91c5037288680590d Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 10:53:17 -0300
Subject: [PATCH 1/8] give it a go

---
 r/configure | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/r/configure b/r/configure
index a0f75f8ddb5..15d718c74da 100755
--- a/r/configure
+++ b/r/configure
@@ -100,6 +100,15 @@ if [ ! "`${R_HOME}/bin/R CMD config CXX17`" ]; then
   exit 1
 fi
 
+# GH-36969: The version of Abseil used in the bundled build won't build on
+# gcc-13. As a workaround for the 13.0.0 release, explicitly set
+# ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
+if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
+  if "`${R_HOME}/bin/R CMD config CXX17`" | grep -e "gcc" ; then
+    export ARROW_WITH_GOOGLE_CLOUD_CPP="OFF"
+  fi
+fi
+
 # Test if pkg-config is available to use
 if ${PKG_CONFIG} --version >/dev/null 2>&1; then
   PKG_CONFIG_AVAILABLE="true"

From b9c41fffec7dc35d72e08373ceb232da61802358 Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 10:56:12 -0300
Subject: [PATCH 2/8] maybe fix

---
 r/configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/r/configure b/r/configure
index 15d718c74da..bffb5ed8835 100755
--- a/r/configure
+++ b/r/configure
@@ -104,7 +104,9 @@ fi
 # gcc-13. As a workaround for the 13.0.0 release, explicitly set
 # ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
 if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
-  if "`${R_HOME}/bin/R CMD config CXX17`" | grep -e "gcc" ; then
+  if ${R_HOME}/bin/R CMD config CXX17 | grep -e "gcc" ; then
+    echo "*** Disabling Arrow build with GCS on gcc-13."
+    echo "*** Set ARROW_WITH_GOOGLE_CLOUD_CPP=ON to explicitly enable."
     export ARROW_WITH_GOOGLE_CLOUD_CPP="OFF"
   fi
 fi

From b59798b693f0bae340ed230d36c5ac6e43953a94 Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 11:13:28 -0300
Subject: [PATCH 3/8] check version

---
 r/configure | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/r/configure b/r/configure
index bffb5ed8835..265499e7c68 100755
--- a/r/configure
+++ b/r/configure
@@ -104,10 +104,13 @@ fi
 # gcc-13. As a workaround for the 13.0.0 release, explicitly set
 # ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
 if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
-  if ${R_HOME}/bin/R CMD config CXX17 | grep -e "gcc" ; then
-    echo "*** Disabling Arrow build with GCS on gcc-13."
-    echo "*** Set ARROW_WITH_GOOGLE_CLOUD_CPP=ON to explicitly enable."
-    export ARROW_WITH_GOOGLE_CLOUD_CPP="OFF"
+  CXX17=`${R_HOME}/bin/R CMD config CXX17`
+  if echo "$CXX17" | grep -e "gcc" ; then
+    if $CXX17 --version | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
+      echo "*** Disabling Arrow build with GCS on gcc-13."
+      echo "*** Set ARROW_WITH_GOOGLE_CLOUD_CPP=ON to explicitly enable."
+      export ARROW_WITH_GOOGLE_CLOUD_CPP="OFF"
+    fi
   fi
 fi
 

From 095621b7f0514e62bf8f981b5bf8fc44489aec37 Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 12:03:48 -0300
Subject: [PATCH 4/8] maybe with the right env var name

---
 r/configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/r/configure b/r/configure
index 265499e7c68..cd891d2da5a 100755
--- a/r/configure
+++ b/r/configure
@@ -108,8 +108,8 @@ if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
   if echo "$CXX17" | grep -e "gcc" ; then
     if $CXX17 --version | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
       echo "*** Disabling Arrow build with GCS on gcc-13."
-      echo "*** Set ARROW_WITH_GOOGLE_CLOUD_CPP=ON to explicitly enable."
-      export ARROW_WITH_GOOGLE_CLOUD_CPP="OFF"
+      echo "*** Set ARROW_GCS=ON to explicitly enable."
+      export ARROW_GCS="OFF"
     fi
   fi
 fi

From 34657f20ba76ff6eb39b167ae00183bbbaadb3ea Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 12:21:00 -0300
Subject: [PATCH 5/8] maybe better test

---
 r/configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/r/configure b/r/configure
index cd891d2da5a..8f8877875b3 100755
--- a/r/configure
+++ b/r/configure
@@ -105,8 +105,9 @@ fi
 # ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
 if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
   CXX17=`${R_HOME}/bin/R CMD config CXX17`
-  if echo "$CXX17" | grep -e "gcc" ; then
-    if $CXX17 --version | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
+  CXX17_VERSION=`$CXX17 --version`
+  if echo "$CXX17_VERSION" | grep -e "gcc" ; then
+    if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
       echo "*** Disabling Arrow build with GCS on gcc-13."
       echo "*** Set ARROW_GCS=ON to explicitly enable."
       export ARROW_GCS="OFF"

From e97e7d3e27a35131d5a7abe885ab5b7c20e2be66 Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 12:25:20 -0300
Subject: [PATCH 6/8] fix another env var reference

---
 r/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r/configure b/r/configure
index 8f8877875b3..9ca8f8f29f3 100755
--- a/r/configure
+++ b/r/configure
@@ -103,7 +103,7 @@ fi
 # GH-36969: The version of Abseil used in the bundled build won't build on
 # gcc-13. As a workaround for the 13.0.0 release, explicitly set
 # ARROW_WITH_GOOGLE_CLOUD_CPP to OFF (if not already set)
-if [ -z "$ARROW_WITH_GOOGLE_CLOUD_CPP" ]; then
+if [ -z "$ARROW_GCS" ]; then
   CXX17=`${R_HOME}/bin/R CMD config CXX17`
   CXX17_VERSION=`$CXX17 --version`
   if echo "$CXX17_VERSION" | grep -e "gcc" ; then

From 8dab7ffe6f891c552f4d3817b872cacebb586374 Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 12:26:12 -0300
Subject: [PATCH 7/8] swallow more output

---
 r/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r/configure b/r/configure
index 9ca8f8f29f3..c554c4ea31e 100755
--- a/r/configure
+++ b/r/configure
@@ -106,7 +106,7 @@ fi
 if [ -z "$ARROW_GCS" ]; then
   CXX17=`${R_HOME}/bin/R CMD config CXX17`
   CXX17_VERSION=`$CXX17 --version`
-  if echo "$CXX17_VERSION" | grep -e "gcc" ; then
+  if echo "$CXX17_VERSION" | grep -e "gcc" > /dev/null ; then
     if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
       echo "*** Disabling Arrow build with GCS on gcc-13."
       echo "*** Set ARROW_GCS=ON to explicitly enable."

From 30cbe9ed2f1eb315611ec380b00b87884349dccf Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Mon, 14 Aug 2023 13:48:40 -0300
Subject: [PATCH 8/8] fix check

---
 r/configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r/configure b/r/configure
index c554c4ea31e..0586cbe0710 100755
--- a/r/configure
+++ b/r/configure
@@ -106,7 +106,7 @@ fi
 if [ -z "$ARROW_GCS" ]; then
   CXX17=`${R_HOME}/bin/R CMD config CXX17`
   CXX17_VERSION=`$CXX17 --version`
-  if echo "$CXX17_VERSION" | grep -e "gcc" > /dev/null ; then
+  if echo "$CXX17_VERSION" | grep -e "g++" > /dev/null ; then
     if echo "$CXX17_VERSION" | grep -e "13.[0-9]\+.[0-9]\+" > /dev/null ; then
       echo "*** Disabling Arrow build with GCS on gcc-13."
       echo "*** Set ARROW_GCS=ON to explicitly enable."