From a58ff1aa6e17d2ce6d3d8b7dbeb5496efd5b1b20 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@posit.co>
Date: Wed, 19 Apr 2023 17:20:33 -0500
Subject: [PATCH] Revert R-devel gcc-8 patch for Ubuntu 18, openSUSE 15.3/15.4

---
 builder/Dockerfile.opensuse-153 |  3 ---
 builder/Dockerfile.opensuse-154 |  3 ---
 builder/Dockerfile.ubuntu-1804  |  3 +--
 builder/build.sh                | 23 -----------------------
 builder/package.opensuse-153    |  6 +++---
 builder/package.opensuse-154    |  6 +++---
 builder/package.ubuntu-1804     |  6 +++---
 7 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/builder/Dockerfile.opensuse-153 b/builder/Dockerfile.opensuse-153
index fbea3b1..df3b732 100644
--- a/builder/Dockerfile.opensuse-153
+++ b/builder/Dockerfile.opensuse-153
@@ -15,9 +15,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     gcc \
     gcc-c++ \
     gcc-fortran \
-    gcc8 \
-    gcc8-c++ \
-    gcc8-fortran \
     glib2-devel \
     glibc-locale \
     help2man \
diff --git a/builder/Dockerfile.opensuse-154 b/builder/Dockerfile.opensuse-154
index f3134fa..1271a03 100644
--- a/builder/Dockerfile.opensuse-154
+++ b/builder/Dockerfile.opensuse-154
@@ -15,9 +15,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     gcc \
     gcc-c++ \
     gcc-fortran \
-    gcc8 \
-    gcc8-c++ \
-    gcc8-fortran \
     glib2-devel \
     glibc-locale \
     help2man \
diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804
index b6c2614..2d0fc61 100644
--- a/builder/Dockerfile.ubuntu-1804
+++ b/builder/Dockerfile.ubuntu-1804
@@ -7,8 +7,7 @@ RUN set -x \
   && export DEBIAN_FRONTEND=noninteractive \
   && apt-get update \
   && apt-get install -y curl libcurl4-openssl-dev libicu-dev libopenblas-base libpcre2-dev wget python-pip \
-  && apt-get build-dep -y r-base \
-  && apt-get install -y gcc-8 g++-8 gfortran-8
+  && apt-get build-dep -y r-base
 
 RUN pip install awscli
 
diff --git a/builder/build.sh b/builder/build.sh
index 143a2af..84b4676 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -129,30 +129,8 @@ compile_r() {
     --with-blas \
     --with-lapack"
 
-  if _version_is_greater_than ${R_VERSION} 4.2.10; then
-      if [[ "${OS_IDENTIFIER}" = "ubuntu-1804" ]]; then
-          default_configure_options="$default_configure_options \
-            CC=gcc-8 CXX=g++-8 FC=gfortran-8"
-          gcc_package=gcc-8
-          gxx_package=g++-8
-          gfortran_package=gfortran-8
-      fi
-  fi
-
   CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:-$default_configure_options}
 
-  # For OpenSUSE CONFIGURE_OPTIONS are custom, set in the Dockerfile
-  if _version_is_greater_than ${R_VERSION} 4.2.10; then
-      if [[ "${OS_IDENTIFIER}" = "opensuse-153" || \
-            "${OS_IDENTIFIER}" = "opensuse-154" ]]; then
-          CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS \
-            CC=gcc-8 CXX=g++-8 FC=gfortran-8"
-          gcc_package=gcc8
-          gxx_package=gcc8-c++
-          gfortran_package=gcc8-fortran
-      fi
-  fi
-
   # set some common environment variables for the configure step
   AWK=/usr/bin/awk \
   LIBnn=lib \
@@ -196,7 +174,6 @@ EOF
 package_r() {
   if [[ -f /package.sh ]]; then
     export R_VERSION=${1}
-    export gcc_package gxx_package gfortran_package
     source /package.sh
   fi
 }
diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153
index 393a297..0f1779b 100644
--- a/builder/package.opensuse-153
+++ b/builder/package.opensuse-153
@@ -39,9 +39,9 @@ homepage: https://www.r-project.org
 license: GPLv2+
 depends:
 - fontconfig
-- ${gcc_package-gcc}
-- ${gxx_package-gcc-c++}
-- ${gfortran_package-gcc-fortran}
+- gcc
+- gcc-c++
+- gcc-fortran
 - glibc-locale
 - gzip
 - icu.691-devel
diff --git a/builder/package.opensuse-154 b/builder/package.opensuse-154
index b97b2d8..3bd9d89 100644
--- a/builder/package.opensuse-154
+++ b/builder/package.opensuse-154
@@ -55,9 +55,9 @@ homepage: https://www.r-project.org
 license: GPLv2+
 depends:
 - fontconfig
-- ${gcc_package-gcc}
-- ${gxx_package-gcc-c++}
-- ${gfortran_package-gcc-fortran}
+- gcc
+- gcc-c++
+- gcc-fortran
 - glibc-locale
 - gzip
 - icu.691-devel
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index f49efaf..a5a75ae 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -27,9 +27,9 @@ deb:
   fields:
     Bugs: https://github.com/rstudio/r-builds/issues
 depends:
-- ${gxx_package-g++}
-- ${gcc_package-gcc}
-- ${gfortran_package-gfortran}
+- g++
+- gcc
+- gfortran
 - libbz2-dev
 - libc6
 - libcairo2