From 2b79717fba416868e1ff33e92022e3828f74bf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= <csardi.gabor@gmail.com>
Date: Tue, 7 Feb 2023 21:06:17 +0100
Subject: [PATCH] Fix R-devel compilation on OpenSUSE

By using newer compilers.
---
 builder/Dockerfile.opensuse-153 |  3 +++
 builder/Dockerfile.opensuse-154 |  3 +++
 builder/build.sh                | 12 ++++++++++++
 builder/package.opensuse-153    |  6 +++---
 builder/package.opensuse-154    |  6 +++---
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/builder/Dockerfile.opensuse-153 b/builder/Dockerfile.opensuse-153
index df3b732..fbea3b1 100644
--- a/builder/Dockerfile.opensuse-153
+++ b/builder/Dockerfile.opensuse-153
@@ -15,6 +15,9 @@ 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 1271a03..f3134fa 100644
--- a/builder/Dockerfile.opensuse-154
+++ b/builder/Dockerfile.opensuse-154
@@ -15,6 +15,9 @@ 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/build.sh b/builder/build.sh
index 9ae6ace..eee64ab 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -132,6 +132,18 @@ compile_r() {
 
   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 \
diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153
index 0f1779b..393a297 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
-- gcc-c++
-- gcc-fortran
+- ${gcc_package-gcc}
+- ${gxx_package-gcc-c++}
+- ${gfortran_package-gcc-fortran}
 - glibc-locale
 - gzip
 - icu.691-devel
diff --git a/builder/package.opensuse-154 b/builder/package.opensuse-154
index 3bd9d89..508aa08 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
-- gcc-c++
-- gcc-fortran
+- ${gxx_package-g++}
+- ${gcc_package-gcc}
+- ${gfortran_package-gfortran}
 - glibc-locale
 - gzip
 - icu.691-devel