Skip to content

Commit 3773e1b

Browse files
committed
Update configure_fastr and post installation message since we distribute GCC runtime libraries on Linux again
1 parent f5927f3 commit 3773e1b

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,11 @@ done
8484
exit 2
8585
fi
8686
res=0
87-
for lib in libgfortran.so.5 libquadmath.so.0 libgcc_s.so.1; do
88-
if ! ldconfig -p | grep --quiet $lib; then
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"
93-
res=1
94-
break
95-
fi
96-
done
9787
if ! ldconfig -p | grep --quiet "libgomp.so.1"; then
9888
echo "Error: could not find OpenMP runtime library: libgomp.so.1"
9989
echo "Please install the OpenMP runtime library runtime libraries:"
10090
echo " On Debian based systems: apt-get install libgomp1"
101-
echo " On Oracle Linux 8: yum install libgomp"
91+
echo " On Oracle Linux: yum install libgomp"
10292
echo " Note: Oracle Linux 8 should contain libgomp by default"
10393
res=1
10494
fi
@@ -114,7 +104,7 @@ done
114104
echo "Note: if you intend to install R packages you may need additional dependencies."
115105
echo "The following packages should cover the most commonly used R packages:"
116106
echo " On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
117-
echo " On Oracle Linux 8: yum groupinstall 'Development Tools'"
107+
echo " On Oracle Linux: yum groupinstall 'Development Tools' && yum install gcc-gfortran"
118108
fi
119109
elif [[ "$OSTYPE" == "darwin"* ]]; then
120110

mx.fastr/mx_fastr_dists.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
276276
include_in_polyglot=False,
277277
post_install_msg="NOTES:\n---------------\n" +
278278
"FastR needs a system-dependent configuration because it links with some system libraries. " +
279-
"A generic configuration that works out of the box on most Linux distributions with GCC and gfortran installed is provided by default. " +
279+
"A generic configuration that works out of the box on most Linux distributions is provided by default. " +
280280
"If you are on another system (e.g., MacOS), wish to fine-tune the configuration to your system, or should you encounter any " +
281281
"issues when running FastR or during R packages installation, try running the following script that adjusts " +
282282
"the configuration to your system: \n" +

0 commit comments

Comments
 (0)