Fix R-devel compilation on OpenSUSE

By using newer compilers.
This commit is contained in:
Gábor Csárdi 2023-02-07 21:06:17 +01:00
commit 2b79717fba
5 changed files with 24 additions and 6 deletions

View file

@ -15,6 +15,9 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
gcc-fortran \ gcc-fortran \
gcc8 \
gcc8-c++ \
gcc8-fortran \
glib2-devel \ glib2-devel \
glibc-locale \ glibc-locale \
help2man \ help2man \

View file

@ -15,6 +15,9 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
gcc-fortran \ gcc-fortran \
gcc8 \
gcc8-c++ \
gcc8-fortran \
glib2-devel \ glib2-devel \
glibc-locale \ glibc-locale \
help2man \ help2man \

View file

@ -132,6 +132,18 @@ compile_r() {
CONFIGURE_OPTIONS=${CONFIGURE_OPTIONS:-$default_configure_options} 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 # set some common environment variables for the configure step
AWK=/usr/bin/awk \ AWK=/usr/bin/awk \
LIBnn=lib \ LIBnn=lib \

View file

@ -39,9 +39,9 @@ homepage: https://www.r-project.org
license: GPLv2+ license: GPLv2+
depends: depends:
- fontconfig - fontconfig
- gcc - ${gcc_package-gcc}
- gcc-c++ - ${gxx_package-gcc-c++}
- gcc-fortran - ${gfortran_package-gcc-fortran}
- glibc-locale - glibc-locale
- gzip - gzip
- icu.691-devel - icu.691-devel

View file

@ -55,9 +55,9 @@ homepage: https://www.r-project.org
license: GPLv2+ license: GPLv2+
depends: depends:
- fontconfig - fontconfig
- gcc - ${gxx_package-g++}
- gcc-c++ - ${gcc_package-gcc}
- gcc-fortran - ${gfortran_package-gfortran}
- glibc-locale - glibc-locale
- gzip - gzip
- icu.691-devel - icu.691-devel