From 56b82b736c4076797b4340bd9cb1c430d33c7f03 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Thu, 16 Jun 2016 22:27:24 -0700
Subject: [PATCH] Ensure libR has dependency on libRblas; some Makefile cleanup

---
 com.oracle.truffle.r.native/fficall/Makefile  |  9 +++++--
 .../gnur/Makefile.libs                        | 25 +++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 96ca7f47c1..d703990b4f 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
@@ -40,10 +40,15 @@ ifeq ($(OS_NAME), Darwin)
 VERSION_FLAGS := -current_version $(R_VERSION) -compatibility_version $(R_VERSION)
 endif
 
+BLAS_TARGET := $(FASTR_LIB_DIR)/libRblas$(DYLIB_EXT)
+
 all: $(C_LIB)
 
 $(C_LIB): objs 
-	$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(C_LIB) $(wildcard lib/*.o) $(VERSION_FLAGS)
+	$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(C_LIB) $(wildcard lib/*.o) -L $(GNUR_HOME)/lib -lRblas $(VERSION_FLAGS)
+ifeq ($(OS_NAME),Darwin)
+	install_name_tool -change libRblas.dylib $(BLAS_TARGET) $(C_LIB)
+endif
 
 objs:
 	$(MAKE) -C src/common all
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.libs b/com.oracle.truffle.r.native/gnur/Makefile.libs
index e71c08f885..13841dcc2b 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.libs
+++ b/com.oracle.truffle.r.native/gnur/Makefile.libs
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
 # questions.
 #
 
-# Copies the Blas and lapack libraries and (maybe) builds the pcre library
+# Copies the Blas and lapack libraries
 
 ifneq (,$(wildcard $(TOPDIR)/platform.mk))
 include $(TOPDIR)/platform.mk
@@ -31,15 +31,13 @@ $(error no platform.mk available)
 endif
 endif
 
-TARGET_DIR := $(abspath $(TOPDIR)/../lib)
-BLAS_TARGET := $(TARGET_DIR)/libRblas$(DYLIB_EXT)
-LAPACK_TARGET := $(TARGET_DIR)/libRlapack$(DYLIB_EXT)
-PCRE_TARGET := $(TARGET_DIR)/libpcre$(DYLIB_EXT)
+BLAS_TARGET := $(FASTR_LIB_DIR)/libRblas$(DYLIB_EXT)
+LAPACK_TARGET := $(FASTR_LIB_DIR)/libRlapack$(DYLIB_EXT)
 
-all: $(TARGET_DIR) $(BLAS_TARGET) $(LAPACK_TARGET)
+all: $(FASTR_LIB_DIR) $(BLAS_TARGET) $(LAPACK_TARGET)
 
-$(TARGET_DIR):
-	mkdir -p $(TARGET_DIR)
+$(FASTR_LIB_DIR):
+	mkdir -p $(FASTR_LIB_DIR)
 
 $(BLAS_TARGET): $(GNUR_HOME)/lib/libRblas$(DYLIB_EXT)
 	cp $(GNUR_HOME)/lib/libRblas$(DYLIB_EXT) $(BLAS_TARGET)
@@ -48,17 +46,12 @@ $(LAPACK_TARGET): $(GNUR_HOME)/lib/libRlapack$(DYLIB_EXT)
 	cp $(GNUR_HOME)/lib/libRlapack$(DYLIB_EXT) $(LAPACK_TARGET)
 ifeq ($(OS_NAME),Darwin)
 	install_name_tool -change libRblas.dylib $(BLAS_TARGET) $(LAPACK_TARGET)
-	install_name_tool -change libR.dylib $(TARGET_DIR)/libR.dylib $(LAPACK_TARGET)
+	install_name_tool -change libR.dylib $(FASTR_LIB_DIR)/libR.dylib $(LAPACK_TARGET)
 	install_name_tool -id $(BLAS_TARGET) $(BLAS_TARGET)
 	install_name_tool -id $(LAPACK_TARGET) $(LAPACK_TARGET)
 endif
 
-PCRE_OBJS := $(wildcard $(GNUR_HOME)/src/extra/pcre/pcre_*.o)
-
-$(PCRE_TARGET): $(PCRE_OBJS) $(TOPDIR)/platform.mk
-	$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(PCRE_TARGET) $(PCRE_OBJS)
-
 clean:
-	rm -f $(BLAS_TARGET) $(LAPACK_TARGET) $(PCRE_TARGET)
+	rm -f $(BLAS_TARGET) $(LAPACK_TARGET)
 
 		
-- 
GitLab