Upgdare to GCC 8.3.0 on Linux

Author: steve-s

ci.jsonnet

@@ -1 +1 @@
-{ overlay : '2e01b12bbd5c53288f1bdd13c258bedc06933c20' }
+{ overlay : 'b2b3ca2e84df168b4ae07477a43c21c43c20e265' }

com.oracle.truffle.r.native/gnur/Makefile.libs

@@ -31,14 +31,8 @@ $(error no platform.mk available)
 endif
 endif
 
-# blas and lapack implementations can be overridden using the following environment variables
-BLAS_LAPACK_DIR ?= $(GNUR_HOME_BINARY)/lib
-BLAS_SOURCE ?= $(BLAS_LAPACK_DIR)/libRblas$(DYLIB_EXT)
-LAPACK_SOURCE ?= $(BLAS_LAPACK_DIR)/libRlapack$(DYLIB_EXT)
-
 BLAS_TARGET := $(FASTR_LIB_DIR)/libRblas$(DYLIB_EXT)
 LAPACK_TARGET := $(FASTR_LIB_DIR)/libRlapack$(DYLIB_EXT)
-
 # at a minimum we need to know where libpcre/libz/libgfortran/libquadmath are located,
 # to keep the Java side simpler, we (may) copy them to $(FASTR_LIB_DIR) unless
 # they were found in the standard system locations
@@ -53,10 +47,10 @@ $(FASTR_LIB_DIR):
 	mkdir -p $(FASTR_LIB_DIR)
 
 $(BLAS_TARGET): $(GNUR_HOME_BINARY)/lib/libRblas$(DYLIB_EXT)
-	cp $(BLAS_SOURCE) $(BLAS_TARGET)
+	cp $(GNUR_HOME_BINARY)/lib/libRblas$(DYLIB_EXT) $(BLAS_TARGET)
 
 $(LAPACK_TARGET): $(GNUR_HOME_BINARY)/lib/libRlapack$(DYLIB_EXT)
-	cp $(LAPACK_SOURCE) $(LAPACK_TARGET)
+	cp $(GNUR_HOME_BINARY)/lib/libRlapack$(DYLIB_EXT) $(LAPACK_TARGET)
 ifeq ($(OS_NAME),Darwin)
 # libRblas depends on libgfortran, libquadmath
 # libRlapack depends on libgfortran, libquadmath, libRblas, libR

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

@@ -84,13 +84,12 @@ done
       exit 2
     fi
     res=0
-    for lib in libgfortran.so.3 libquadmath.so.0 libgcc_s.so.1; do
+    for lib in libgfortran.so.5 libquadmath.so.0 libgcc_s.so.1; do
       if ! ldconfig -p | grep --quiet $lib; then
-        echo "Error: could not find gfortran3 runtime library: $lib"
-        echo "Please install the gfortran3 runtime libraries:"
-        echo "    On Debian based systems: apt-get install libgfortran3"
-        echo "    On Oracle Linux 7: yum install libgfortran"
-        echo "    On Oracle Linux 8: yum install compat-libgfortran-48"
+        echo "Error: could not find gfortran5 runtime library: $lib"
+        echo "Please install the gfortran5 runtime libraries:"
+        echo "    On Debian based systems: apt-get install libgfortran-8-dev"
+        echo "    On Oracle Linux 8: yum install libgfortran"
         res=1
         break
       fi
@@ -99,19 +98,10 @@ done
       echo "Error: could not find OpenMP runtime library: libgomp.so.1"
       echo "Please install the OpenMP runtime library runtime libraries:"
       echo "    On Debian based systems: apt-get install libgomp1"
-      echo "    On Oracle Linux 7 and 8: yum install libgomp"
+      echo "    On Oracle Linux 8: yum install libgomp"
       echo "    Note: Oracle Linux 8 should contain libgomp by default"
       res=1
     fi
-    if which gfortran > /dev/null 2> /dev/null; then
-      echo "Note: if you intend to install R packages you may need additional packages."
-      echo "The following packages should cover the most commonly used R packages:"
-      echo "    On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
-      echo "    On Oracle Linux 7 and 8: yum groupinstall 'Development Tools'"
-      if [[ $res != 0 ]]; then
-        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)."
-      fi
-    fi
     if [[ $res != 0 ]]; then
       echo "The basic configuration of FastR failed."
       echo "To learn more:"
@@ -120,6 +110,11 @@ done
       exit 1
     else
       echo "The basic configuration of FastR was successfull."
+      echo ""
+      echo "Note: if you intend to install R packages you may need additional dependencies."
+      echo "The following packages should cover the most commonly used R packages:"
+      echo "    On Debian based systems: apt-get install build-essential gfortran libxml2 libc++-dev"
+      echo "    On Oracle Linux 8: yum groupinstall 'Development Tools'"
     fi
   elif [[ "$OSTYPE" == "darwin"* ]]; then