From 6ab11e64ec16be90cf8c63ca80c7243c4ec0f86d Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Tue, 24 Apr 2018 10:58:38 +0200
Subject: [PATCH] update readme, remove unused dependency
---
README.md | 2 +-
mx.fastr/suite.py | 19 +++++--------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 54ec5fa9f8..d42ab6e785 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ FastR uses a build tool called `mx` (cf `maven`) which can be downloaded from [h
## Pre-Requisites
FastR shares some code with GnuR, for example, the default packages and the Blas library. Therefore, a version of GnuR (currently
-R-3.3.2), is downloaded and built as part of the build. Both GNU R and FastR require access certain tools and packages that must be available
+R-3.4.0), is downloaded and built as part of the build. Both GNU R and FastR require access certain tools and packages that must be available
prior to the build. These are:
A jvmci-enabled Java JDK which is available from [pre-built binary](http://www.oracle.com/technetwork/oracle-labs/program-languages/downloads/index.html)
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index d3d1571cab..11609a132c 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -20,18 +20,18 @@ suite = {
"repositories" : {
"snapshots" : {
"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots",
- "licenses" : ["GPLv2"]
+ "licenses" : ["GPLv3"]
}
},
"licenses" : {
- "GPLv2" : {
- "name" : "GNU General Public License, version 2",
- "url" : "http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"
+ "GPLv3" : {
+ "name" : "GNU General Public License, version 3",
+ "url" : "https://www.gnu.org/licenses/gpl-3.0.html"
},
},
- "defaultLicense" : "GPLv2",
+ "defaultLicense" : "GPLv3",
# libraries that we depend on
# N.B. The first four with a "path" attribute must be located
@@ -47,13 +47,6 @@ suite = {
"resource" : "true"
},
- "GNU_ICONV" : {
- "path" : "libdownloads/libiconv-1.14.tar.gz",
- "urls" : ["http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz"],
- "sha1" : "be7d67e50d72ff067b2c0291311bc283add36965",
- "resource" : "true"
- },
-
"ANTLR-3.5_4_ANNOT_PROC" : {
"path" : "libdownloads/antlr-runtime-3.5.jar",
"urls" : ["http://central.maven.org/maven2/org/antlr/antlr-runtime/3.5/antlr-runtime-3.5.jar"],
@@ -279,7 +272,6 @@ suite = {
# "class" : "FastRNativeProject",
"dependencies" : [
"GNUR",
- "GNU_ICONV",
"truffle:TRUFFLE_NFI_NATIVE",
],
"native" : True,
@@ -364,7 +356,6 @@ suite = {
"truffle:JLINE",
"ANTLR-3.5",
"GNUR",
- "GNU_ICONV",
"XZ-1.6",
],
"distDependencies" : [
--
GitLab