From fd42be02d4b74917adf8d0601a451290fc83e931 Mon Sep 17 00:00:00 2001
From: Zbynek Slajchrt <zbynek.slajchrt@oracle.com>
Date: Tue, 24 Oct 2017 14:51:51 +0200
Subject: [PATCH] Rebased on master
---
com.oracle.truffle.r.native/gnur/Makefile.gnur | 1 -
.../gnur/patch/src/library/tools/src/gramRd.c | 8 ++------
mx.fastr/mx_fastr.py | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index f43dec8c6f..6351e4fae6 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -149,7 +149,6 @@ $(info Installing R-$(R_VERSION) into $(GNUR_HOME_BINARY) ...)
$(GNUR_HOME_BINARY):
mkdir -p $(GNUR_HOME_BINARY_PARENT)
tar xf $(TOPDIR)/../libdownloads/R-$(R_VERSION).tar.gz -C $(GNUR_HOME_BINARY_PARENT)
- ln -s $(GNUR_HOME_BINARY_PARENT)/R-$(R_VERSION) $(GNUR_HOME_BINARY)
(cd $(GNUR_HOME_BINARY); ./configure --with-x=no --with-aqua=no $(RECPKGS) --enable-memory-profiling $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1; $(MAKE) MAKE=$(MAKE) -j > gnur_make.log 2>&1)
else
$(GNUR_HOME_BINARY):
diff --git a/com.oracle.truffle.r.native/gnur/patch/src/library/tools/src/gramRd.c b/com.oracle.truffle.r.native/gnur/patch/src/library/tools/src/gramRd.c
index 1d76e4b506..6c1c3541dd 100644
--- a/com.oracle.truffle.r.native/gnur/patch/src/library/tools/src/gramRd.c
+++ b/com.oracle.truffle.r.native/gnur/patch/src/library/tools/src/gramRd.c
@@ -106,10 +106,8 @@
#endif
-extern SEXP FASTR_R_SrcrefSymbol();
-#define R_SrcrefSymbol FASTR_R_SrcrefSymbol()
-extern SEXP FASTR_R_SrcfileSymbol();
-#define R_SrcfileSymbol FASTR_R_SrcfileSymbol()
+extern SEXP R_SrcrefSymbol;
+extern SEXP R_SrcfileSymbol;
extern int R_ParseContextLast;
#define R_EOF -1
#define PARSE_ERROR_SIZE 256
@@ -119,8 +117,6 @@ static char R_ParseContext[PARSE_CONTEXT_SIZE];
int R_ParseContextLast;
int R_ParseContextLine;
int R_ParseError;
-extern SEXP FASTR_R_EmptyEnv();
-#define R_EmptyEnv FASTR_R_EmptyEnv()
extern SEXP R_NewHashedEnv(SEXP a, SEXP b);
char *dgettext(const char *p, const char *msgid) {
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 32ded70122..55f9262259 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -439,7 +439,7 @@ def rbdiag(args):
mx.run_java(vmArgs + args)
def _gnur_path():
- gnurHome = os.environ.get('GNUR_HOME_BINARY', 'libdownloads')
+ gnurHome = os.environ.get('GNUR_HOME_BINARY', join(_fastr_suite.dir, 'libdownloads'))
return join(gnurHome, r_version(), 'bin')
def gnu_r(args):
--
GitLab