From c3e3dfe12e19389f110133f62cd49acaa5871b6c Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 7 Oct 2016 10:43:08 -0700
Subject: [PATCH] ci.hocon: no forward references
---
ci.hocon | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/ci.hocon b/ci.hocon
index 99fe13999b..770710ffb7 100644
--- a/ci.hocon
+++ b/ci.hocon
@@ -25,6 +25,17 @@ logfiles : [
"com.oracle.truffle.r.native/gnur/libiconv-*/iconv_make.log"
]
+# This is needed by all (Linux) builds but is specific to the module system employed
+# on the CI cluster. Not all of the modules are needed by FastR but all are needed by the
+# embedded GNU R that is built within FastR.
+
+pkgEnvironment: {
+ environment : {
+ PKG_INCLUDE_FLAGS_OVERRIDE : """"-I/cm/shared/apps/zlib/1.2.8/include -I/cm/shared/apps/bzip2/1.0.6/include -I/cm/shared/apps/xz/5.2.2/include -I/cm/shared/apps/pcre/8.38/include -I/cm/shared/apps/curl/7.50.1/include""""
+ PKG_LDFLAGS_OVERRIDE : """"-L/cm/shared/apps/zlib/1.2.8/lib -L/cm/shared/apps/bzip2/1.0.6/lib -L/cm/shared/apps/xz/5.2.2/lib -L/cm/shared/apps/pcre/8.38/lib -L/cm/shared/apps/curl/7.50.1//lib -L/cm/shared/apps/gcc/4.9.1/lib64""""
+ }
+}
+
packagesLinux : ${pkgEnvironment} {
packages : {
git : ">=1.8.3"
@@ -76,6 +87,13 @@ gateTestCommon : ${common} {
gateTestLinux : ${gateTestCommon} {
}
+darwinEnvironment : {
+ environment : {
+ PATH : "/usr/local/bin:$JAVA_HOME/bin:$PATH"
+ F77: "/usr/local/bin/gfortran-4.9"
+ }
+}
+
gateTestDarwin : ${gateTestCommon} ${darwinEnvironment} {
packages : ${packagesDarwin} {
}
--
GitLab