Use corrent DEB packages
Need gcc, g++, gfortran for R <= 4.2.x, and gcc-8, g++-8, gofrtran-8 for R >= 4.3.0.
This commit is contained in:
parent
9b2fecd9e2
commit
f5a104562e
2 changed files with 10 additions and 6 deletions
|
|
@ -124,6 +124,9 @@ compile_r() {
|
|||
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
|
||||
|
||||
|
|
@ -172,6 +175,7 @@ EOF
|
|||
package_r() {
|
||||
if [[ -f /package.sh ]]; then
|
||||
export R_VERSION=${1}
|
||||
export gcc_package gxx_package gfortran_package
|
||||
source /package.sh
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,9 +27,9 @@ deb:
|
|||
fields:
|
||||
Bugs: https://github.com/rstudio/r-builds/issues
|
||||
depends:
|
||||
- g++-8
|
||||
- gcc-8
|
||||
- gfortran-8
|
||||
- ${gxx_package-g++}
|
||||
- ${gcc_package-gcc}
|
||||
- ${gfortran_package-gfortran}
|
||||
- libbz2-dev
|
||||
- libc6
|
||||
- libcairo2
|
||||
|
|
|
|||
Loading…
Reference in a new issue