Fix build of rpart and cluster

(cherry picked from commit fd48470559cec086cdd046de63a4a63402c72a38)

Author: Pavel Marek

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

@@ -37,7 +37,7 @@ endif
 
 FASTR_R_HOME = $(abspath $(TOPDIR)/..)
 R_VERSION = 4.0.3
-# The package tar balls are copied from $(GNUR_HOME_BINARY_UNPACKED)/src/library/Recommended
+# Most of the package tar balls are copied from $(GNUR_HOME_BINARY_UNPACKED)/src/library/Recommended
 export GNUR_HOME_BINARY_UNPACKED = $(FASTR_R_HOME)/libdownloads/R-$(R_VERSION)
 
 ifndef GNUR_HOME_BINARY
@@ -121,6 +121,24 @@ install.recommended: $(ALL_RECOMMENDED_TARS)
 # If FASTR_RECOMMENDED_BINARY is not defined, we just build the packages
 else 
 
+RPART_DIR_NAME := bethatkinson-rpart-4020bb4
+RPART_BUILT_TARBALL := rpart_4.1-16.tar.gz
+# rpart package is downloaded as a tarball directly from GitHub. Unfortunately, we have to make some
+# modifications to that tarball - remove `build` directory.
+rpart.ts: $(RPART_TAR)
+	@echo 'Installing recommended package rpart'
+	tar xf $<
+	rm -rf $(RPART_DIR_NAME)/build
+	# This command creates $RPART_BUILT_TARBALL via GNU-R for better compatibility
+	$(GNUR_HOME_BINARY)/bin/R CMD build --no-build-vignettes $(RPART_DIR_NAME)
+	_R_CHECK_INSTALL_DEPENDS_=no FASTR_USE_F2C=true $(FASTR_R_HOME)/bin/R --polyglot CMD INSTALL $(INSTALL_OPTS) --library=$(FASTR_R_HOME)/library $(RPART_BUILT_TARBALL) &> $@.out || (cat $@.out && exit 1)
+	@echo Finished installing recommended package `basename $<`
+
+cluster.ts: $(CLUSTER_TAR)
+	@echo Installing recommended package `basename $<`
+	@_R_CHECK_INSTALL_DEPENDS_=no FASTR_USE_F2C=true $(FASTR_R_HOME)/bin/R --polyglot CMD INSTALL $(INSTALL_OPTS) --library=$(FASTR_R_HOME)/library $< &> $@.out || (cat $@.out && exit 1)
+	@echo Finished installing recommended package `basename $<`
+
 %.ts: $(GNUR_RECOMMENDED_TAR_DIR)%.tgz
 	@echo Installing recommended package `basename $<`
 	@_R_CHECK_INSTALL_DEPENDS_=no FASTR_USE_F2C=true $(FASTR_R_HOME)/bin/R --polyglot CMD INSTALL $(INSTALL_OPTS) --library=$(FASTR_R_HOME)/library $< &> $@.out || (cat $@.out && exit 1)

mx.fastr/suite.py

@@ -71,7 +71,7 @@
     # A recommended package "rpart" with a fixed version rather than taken from GNU-R.
     "RPART" : {
       "path" : "libdownloads/rpart.tar.gz",
-      "ext" : "tar.gz",
+      "ext" : ".tar.gz",
       "version" : "4020bb4ee8fd6739bd97e8c39931fa7e3901300c",
       "urls" : ["https://api.github.com/repos/bethatkinson/rpart/tarball/{version}"],
       "sha1" : "ec76dbd51acad10bed843a0005ba5fdcf5c7a35d",
@@ -81,7 +81,7 @@
     # A recommended package "cluster" with a fixed version rather than taken from GNU-R.
     "CLUSTER" : {
       "path" : "libdownloads/cluster.tar.gz",
-      "ext" : "tar.gz",
+      "ext" : ".tar.gz",
       "version" : "2.1.2",
       "urls" : ["https://cran.r-project.org/src/contrib/cluster_{version}.tar.gz"],
       "sha1" : "47763fa44d11e0f2c2feafade3e331c05eda30d1",