From c4f37ebe321d58231a73fb81ffe31a1a1b9c9413 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 16 Nov 2015 21:04:00 -0800
Subject: [PATCH] copyright fix; fix relative include in fficall/common
---
com.oracle.truffle.r.native/fficall/Makefile | 2 +-
.../fficall/src/common/arithmetic.c | 2 +-
.../fficall/src/jni/Makefile | 5 ++++-
mx.fastr/copyrights/overrides | 15 ++++++++-------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 50f72a6222..12c32f3b32 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
diff --git a/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c b/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
index c387fdea7e..1e276aa46f 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
+++ b/com.oracle.truffle.r.native/fficall/src/common/arithmetic.c
@@ -103,7 +103,7 @@ int R_finite(double x)
}
#undef _
-#include "../../../gnur/R-3.1.3/src/nmath/nmath.h"
+#include <nmath.h>
double fround(double x, double digits) {
#define MAX_DIGITS DBL_MAX_10_EXP
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/Makefile b/com.oracle.truffle.r.native/fficall/src/jni/Makefile
index 5787de86b0..abde616517 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/jni/Makefile
@@ -52,7 +52,10 @@ C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(C_SOURCES))
JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(JDK_OS_DIR)
FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/gnur/R-3.1.3/src/include -I$(TOPDIR)/include/R_ext
-INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES)
+# The need for thhis should be reviewed
+GNUR_INCLUDES = -I$(TOPDIR)/gnur/R-3.1.3/src/include -I$(TOPDIR)/gnur/R-3.1.3/src/nmath
+
+INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES) $(GNUR_INCLUDES)
all: Makefile $(C_COMMON_SOURCES) $(C_LIB)
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index 01f01fac3f..3dd00a00d4 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -40,13 +40,14 @@ com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/CountFields.
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/Menu.java,gnu_r.copyright
com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/utils/WriteTable.java,gnu_r.copyright
com.oracle.truffle.r.native/builtinlibs/src/xerbla.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/alloc.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/main_engine.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/main_print.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/register.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/sys.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/unimplemented.c,gnu_r.copyright
-com.oracle.truffle.r.native/fficall/jni/src/util.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/Memory.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/main_engine.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/main_print.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/Rdynload.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/sys.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/jni/unimplemented.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/common/util.c,gnu_r.copyright
+com.oracle.truffle.r.native/fficall/src/common/variable_defs.h,gnu_r.copyright
com.oracle.truffle.r.native/include/src/libintl.h,no.copyright
com.oracle.truffle.r.native/library/base/src/registration.c,no.copyright
com.oracle.truffle.r.native/library/graphics/src/graphics.h,no.copyright
--
GitLab