[GR-19768] Use gnur module in fastr.

Pavel Marek · Pavel Marek · commit 113bbff29a1e · 2022-01-12T09:26:25.000Z
PullRequest: graal/10764
diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
@@ -129,6 +129,7 @@ fastr_linux: ${fastr} {
     PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64"
     FASTR_FC: "/cm/shared/apps/gcc/4.8.5/bin/gfortran"
     FASTR_CC: "/cm/shared/apps/gcc/4.8.5/bin/gcc"
+    GNUR_HOME_BINARY: "/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3"
   }
   downloads: {
     BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "4.8.5", platformspecific: true },
diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -66,7 +66,7 @@
             },
             {
                 "name": "fastr",
-                "version": "4808a5171e15ee77b6709efa8035d2cc5b9f6db7",
+                "version": "42ca05e9228e79fa52a2d49589d1a23d64773a9a",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/fastr.git", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ fastr_linux: ${fastr} {`
`129`	`129`	`PKG_LDFLAGS_OVERRIDE : "-L/cm/shared/apps/zlib/1.2.11/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre2/10.37/lib -L/cm/shared/apps/curl/7.50.1/lib -L/cm/shared/apps/gcc/4.8.5/lib64"`
`130`	`130`	`FASTR_FC: "/cm/shared/apps/gcc/4.8.5/bin/gfortran"`
`131`	`131`	`FASTR_CC: "/cm/shared/apps/gcc/4.8.5/bin/gcc"`
	`132`	`+ GNUR_HOME_BINARY: "/cm/shared/apps/gnur/4.0.3_gcc4.8.5_pcre2-10.37/R-4.0.3"`
`132`	`133`	`}`
`133`	`134`	`downloads: {`
`134`	`135`	`BLAS_LAPACK_DIR: { name: "fastr-403-blas-lapack-gcc", version: "4.8.5", platformspecific: true },`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`},`
`67`	`67`	`{`
`68`	`68`	`"name": "fastr",`
`69`		`- "version": "4808a5171e15ee77b6709efa8035d2cc5b9f6db7",`
	`69`	`+ "version": "42ca05e9228e79fa52a2d49589d1a23d64773a9a",`
`70`	`70`	`"dynamic": True,`
`71`	`71`	`"urls": [`
`72`	`72`	`{"url": "https://github.com/oracle/fastr.git", "kind": "git"},`