Solaris build fixed. Failed GNUR build detected.

ci.hocon

@@ -196,7 +196,7 @@ builds = [
   ${gateStyle}                {capabilities : [linux, amd64],  targets : [gate], name: "gate-style-linux-amd64"}
   ${rbcheck}                  {capabilities : [linux, amd64],  targets : [gate], name: "gate-rbcheck-linux-amd64"}
   ${internalPkgtest}          {capabilities : [linux, amd64],  targets : [gate], name: "gate-internal-pkgtest-linux-amd64"}
-  # ${gateTestManagedLinux}     {capabilities : [linux, amd64, fast],  targets : [gate], name: "gate-test-managed-linux-amd64"}
+  #${gateTestManagedLinux}     {capabilities : [linux, amd64, fast],  targets : [gate], name: "gate-test-managed-linux-amd64"}
   ${gateTestJava9Linux}       {capabilities : [linux, amd64, fast],  targets : [gate], name: "gate-test-java9-linux-amd64"}
   ${gnurTests}                {capabilities : [linux, amd64, fast],  targets : [gate], name: "gate-gnur-tests"}
 ]

com.oracle.truffle.r.native/gnur/Makefile.gnur

@@ -56,7 +56,8 @@ else
 	$(error OS $(OSNAME) is not supported)
 endif
 
-all: Makefile $(GNUR_HOME_BINARY) $(PATCH_BUILD) iconv config $(PATCH_BUILD)/include
+all: Makefile iconv $(GNUR_HOME_BINARY)/gnur.done $(PATCH_BUILD) config $(PATCH_BUILD)/include
+
 
 # After this platform check, GNUR_CONFIG_FLAGS must be set
 ifeq ($(OSNAME), SunOS)
@@ -141,18 +142,15 @@ ifndef FASTR_RELEASE
 RECPKGS := "--without-recommended-packages"
 endif
 
-ifeq ($(wildcard $(GNUR_HOME_BINARY)),)
 GNUR_HOME_BINARY_PARENT := $(dir $(GNUR_HOME_BINARY))
 
-$(info Installing R-$(R_VERSION) into $(GNUR_HOME_BINARY) ...)
-
-$(GNUR_HOME_BINARY):
+$(GNUR_HOME_BINARY)/gnur.done:
+	echo Installing R-$(R_VERSION) into $(GNUR_HOME_BINARY)
+	rm -rf $(GNUR_HOME_BINARY)
 	mkdir -p $(GNUR_HOME_BINARY_PARENT)
-	tar xf $(TOPDIR)/../libdownloads/R-$(R_VERSION).tar.gz -C $(GNUR_HOME_BINARY_PARENT)
+	(cd $(GNUR_HOME_BINARY_PARENT); tar xf R-$(R_VERSION).tar.gz)
 	(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): 
-endif
+	touch $(GNUR_HOME_BINARY)/gnur.done
 
 IN_FILES := $(patsubst %.in,%,$(abspath $(shell find $(PATCH) -name '*.in')))
 IN_FILES_PREFIX := $(abspath $(PATCH))
@@ -173,7 +171,7 @@ $(PATCH_BUILD)/Makefile:
 	ln -s $(GNUR_HOME_BINARY)/config.log $(PATCH_BUILD)/config.log
 	for target in $(IN_FILES); do \
 		f=`echo $$target | cut -c $(IN_FILES_PREFIX_LEN)-`; \
-		cp -v $(GNUR_HOME_BINARY)$$f $(PATCH_BUILD)$$f; \
+		cp $(GNUR_HOME_BINARY)$$f $(PATCH_BUILD)$$f; \
 	done
 
 $(PATCH_BUILD)/include:

com.oracle.truffle.r.native/gnur/patch/src/library/grDevices/Makefile

@@ -47,12 +47,16 @@ endif
 include $(TOPDIR)/fficall/src/include/gnurheaders.mk
 PKG_INCLUDES := $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) $(GRDEV_INCLUDES)
 # Suppress warnings
-XTRA_C_OPTS := -Wno-int-conversion -Wno-implicit-function-declaration
+ifeq ($(OS_NAME), SunOS)
+    XTRA_C_OPTS :=
+else
+	XTRA_C_OPTS := -Wno-int-conversion -Wno-implicit-function-declaration
+endif
 
 include ../lib.mk
 
 $(OBJ)/%.o: $(GNUR_SRC_CAIRO)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) $(GRDEV_INCLUDES) $(SUPPRESS_WARNINGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) $(GRDEV_INCLUDES) -c $< -o $@
 
 $(OBJ)/gzio.o: $(SRC)/gzio.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) -DGNUR_GZIO_H=\"$(GNUR_GZIO_H)\" $(SUPPRESS_WARNINGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) -DGNUR_GZIO_H=\"$(GNUR_GZIO_H)\" -c $< -o $@

com.oracle.truffle.r.native/gnur/patch/src/library/graphics/Makefile

@@ -21,6 +21,14 @@
 # questions.
 #
 
+ifneq (,$(wildcard $(TOPDIR)/platform.mk))
+include $(TOPDIR)/platform.mk
+else
+ifneq ($(MAKECMDGOALS),clean)
+$(error no platform.mk available)
+endif
+endif
+
 OBJ = lib
 
 include $(TOPDIR)/fficall/src/include/gnurheaders.mk
@@ -31,10 +39,14 @@ GNUR_INCLUDES := -I$(TOPDIR)/fficall/src/include
 GRAPHICS_INCLUDES := -I$(GNUR_HOME)/src/library/graphics
 PKG_INCLUDES := $(GNUR_INCLUDES) $(GNUR_HEADER_DEFS) $(GRAPHICS_INCLUDES)
 # Suppress warnings
-XTRA_C_OPTS := -Wno-int-conversion -Wno-implicit-function-declaration
+ifeq ($(OS_NAME), SunOS)
+    XTRA_C_OPTS :=
+else
+	XTRA_C_OPTS := -Wno-int-conversion -Wno-implicit-function-declaration
+endif
 
 include ../lib.mk
 
 # plot.c needs to include the GNUR internal Print.h
 $(OBJ)/plot.o: src/plot.c
-	$(CC) $(CFLAGS) $(GNUR_INCLUDES) $(INCLUDES) $(GNUR_HEADER_DEFS) $(GRAPHICS_INCLUDES) $(SUPPRESS_WARNINGS) -c $< -o $@
+	$(CC) $(CFLAGS) $(GNUR_INCLUDES) $(INCLUDES) $(GNUR_HEADER_DEFS) $(GRAPHICS_INCLUDES) -c $< -o $@