Skip to content

Commit 2845fe7

Browse files
committed
[GR-21133] Use GCC 8.3.0 on Linux.
PullRequest: fastr/2347
2 parents 076a6b3 + 128f671 commit 2845fe7

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ overlay : '2e01b12bbd5c53288f1bdd13c258bedc06933c20' }
1+
{ overlay : 'b2b3ca2e84df168b4ae07477a43c21c43c20e265' }

com.oracle.truffle.r.native/fficall/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ ifeq ($(OS_NAME), Darwin)
6464
VERSION_FLAGS := -current_version $(R_VERSION) -compatibility_version $(R_VERSION)
6565
endif
6666

67-
# TODO: can we remove those?
68-
BLAS_TARGET := $(FASTR_LIB_DIR)/libRblas$(DYLIB_EXT)
69-
LAPACK_TARGET := $(FASTR_LIB_DIR)/libRlapack$(DYLIB_EXT)
70-
7167
all: $(R_LIB)
7268

7369
# use sentinels to avoid (usually unnecessary) rebuilds.

com.oracle.truffle.r.native/run/fastr_tools/configure_fastr

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,12 @@ done
8484
exit 2
8585
fi
8686
res=0
87-
for lib in libgfortran.so.3 libquadmath.so.0 libgcc_s.so.1; do
87+
for lib in libgfortran.so.5 libquadmath.so.0 libgcc_s.so.1; do
8888
if ! ldconfig -p | grep --quiet $lib; then
89-
echo "Error: could not find gfortran3 runtime library: $lib"
90-
echo "Please install the gfortran3 runtime libraries:"
91-
echo " On Debian based systems: apt-get install libgfortran3"
92-
echo " On Oracle Linux 7: yum install libgfortran"
93-
echo " On Oracle Linux 8: yum install compat-libgfortran-48"
89+
echo "Error: could not find gfortran5 runtime library: $lib"
90+
echo "Please install the gfortran5 runtime libraries:"
91+
echo " On Debian based systems: apt-get install libgfortran-8-dev"
92+
echo " On Oracle Linux 8: yum install libgfortran"
9493
res=1
9594
break
9695
fi
@@ -99,19 +98,10 @@ done
9998
echo "Error: could not find OpenMP runtime library: libgomp.so.1"
10099
echo "Please install the OpenMP runtime library runtime libraries:"
101100
echo " On Debian based systems: apt-get install libgomp1"
102-
echo " On Oracle Linux 7 and 8: yum install libgomp"
101+
echo " On Oracle Linux 8: yum install libgomp"
103102
echo " Note: Oracle Linux 8 should contain libgomp by default"
104103
res=1
105104
fi
106-
if which gfortran > /dev/null 2> /dev/null; then
107-
echo "Note: if you intend to install R packages you may need additional packages."
108-
echo "The following packages should cover the most commonly used R packages:"
109-
echo " On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
110-
echo " On Oracle Linux 7 and 8: yum groupinstall 'Development Tools'"
111-
if [[ $res != 0 ]]; then
112-
echo "Caution: you still need to install gfortran3 runtime libraries on all systems where this version is not the default (Ubuntu 18 or higher, Oracle Linux 8 or higher)."
113-
fi
114-
fi
115105
if [[ $res != 0 ]]; then
116106
echo "The basic configuration of FastR failed."
117107
echo "To learn more:"
@@ -120,6 +110,11 @@ done
120110
exit 1
121111
else
122112
echo "The basic configuration of FastR was successfull."
113+
echo ""
114+
echo "Note: if you intend to install R packages you may need additional dependencies."
115+
echo "The following packages should cover the most commonly used R packages:"
116+
echo " On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
117+
echo " On Oracle Linux 8: yum groupinstall 'Development Tools'"
123118
fi
124119
elif [[ "$OSTYPE" == "darwin"* ]]; then
125120

0 commit comments

Comments
 (0)