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
3 changed files with 10 additions and 6 deletions
|
|
@ -124,6 +124,9 @@ compile_r() {
|
||||||
if [[ "${OS_IDENTIFIER}" = "ubuntu-1804" ]]; then
|
if [[ "${OS_IDENTIFIER}" = "ubuntu-1804" ]]; then
|
||||||
default_configure_options="$default_configure_options \
|
default_configure_options="$default_configure_options \
|
||||||
CC=gcc-8 CXX=g++-8 FC=gfortran-8"
|
CC=gcc-8 CXX=g++-8 FC=gfortran-8"
|
||||||
|
gcc_package=gcc-8
|
||||||
|
gxx_package=g++-8
|
||||||
|
gfortran_package=gfortran-8
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -172,6 +175,7 @@ EOF
|
||||||
package_r() {
|
package_r() {
|
||||||
if [[ -f /package.sh ]]; then
|
if [[ -f /package.sh ]]; then
|
||||||
export R_VERSION=${1}
|
export R_VERSION=${1}
|
||||||
|
export gcc_package gxx_package gfortran_package
|
||||||
source /package.sh
|
source /package.sh
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@ deb:
|
||||||
fields:
|
fields:
|
||||||
Bugs: https://github.com/rstudio/r-builds/issues
|
Bugs: https://github.com/rstudio/r-builds/issues
|
||||||
depends:
|
depends:
|
||||||
- g++-8
|
- ${gxx_package-g++}
|
||||||
- gcc-8
|
- ${gcc_package-gcc}
|
||||||
- gfortran-8
|
- ${gfortran_package-gfortran}
|
||||||
- libbz2-dev
|
- libbz2-dev
|
||||||
- libc6
|
- libc6
|
||||||
- libcairo2
|
- libcairo2
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,9 @@ R_HOME=/opt/R/${R_VERSION}/lib/R
|
||||||
"${R_HOME}/bin/Rscript" -e 'sessionInfo()'
|
"${R_HOME}/bin/Rscript" -e 'sessionInfo()'
|
||||||
|
|
||||||
# List R devel dependencies
|
# List R devel dependencies
|
||||||
gcc --version
|
$("${R_HOME}/bin/R" CMD config CC) --version
|
||||||
g++ --version
|
$("${R_HOME}/bin/R" CMD config CXX) --version
|
||||||
gfortran --version
|
$("${R_HOME}/bin/R" CMD config FC) --version
|
||||||
|
|
||||||
# List shared library dependencies (e.g. BLAS/LAPACK)
|
# List shared library dependencies (e.g. BLAS/LAPACK)
|
||||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${R_HOME}/lib ldd "${R_HOME}/lib/libR.so"
|
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${R_HOME}/lib ldd "${R_HOME}/lib/libR.so"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue