From 3ce872f225f4d637c1966defff7be95c4eb3b6f1 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Fri, 23 Oct 2020 14:37:21 +0200 Subject: [PATCH] Allow spaces in paths when building gnur --- com.oracle.truffle.r.native/gnur/Makefile.gnur | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur index c6b7c2dfdc..8b9c31e76c 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile.gnur +++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur @@ -103,18 +103,18 @@ GNUR_HOME_BINARY_UNPACKED_PARENT := $(dir $(GNUR_HOME_BINARY_UNPACKED)) ifdef BUILD_GNUR $(GNUR_HOME_BINARY_UNPACKED)/gnur.done: echo Installing R-$(R_VERSION) into $(GNUR_HOME_BINARY_UNPACKED) - rm -rf $(GNUR_HOME_BINARY_UNPACKED) - mkdir -p $(GNUR_HOME_BINARY_UNPACKED_PARENT) - (cd $(GNUR_HOME_BINARY_UNPACKED_PARENT); tar xf R-$(R_VERSION).tar.gz) - (cd $(GNUR_HOME_BINARY_UNPACKED); ./configure --with-x=no --with-aqua=no $(RECPKGS) --enable-memory-profiling $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1; $(MAKE) -j > gnur_make.log 2>&1) - touch $(GNUR_HOME_BINARY_UNPACKED)/gnur.done + rm -rf "$(GNUR_HOME_BINARY_UNPACKED)" + mkdir -p "$(GNUR_HOME_BINARY_UNPACKED_PARENT)" + (cd "$(GNUR_HOME_BINARY_UNPACKED_PARENT)"; tar xf R-$(R_VERSION).tar.gz) + (cd "$(GNUR_HOME_BINARY_UNPACKED)"; ./configure --with-x=no --with-aqua=no $(RECPKGS) --enable-memory-profiling $(GNUR_CONFIG_FLAGS) > gnur_configure.log 2>&1; "$(MAKE)" -j > gnur_make.log 2>&1) + touch "$(GNUR_HOME_BINARY_UNPACKED)/gnur.done" else $(GNUR_HOME_BINARY_UNPACKED)/gnur.done: echo Unpacking R-$(R_VERSION) into $(GNUR_HOME_BINARY_UNPACKED) - rm -rf $(GNUR_HOME_BINARY_UNPACKED) - mkdir -p $(GNUR_HOME_BINARY_UNPACKED_PARENT) - (cd $(GNUR_HOME_BINARY_UNPACKED_PARENT); tar xf R-$(R_VERSION).tar.gz) - touch $(GNUR_HOME_BINARY_UNPACKED)/gnur.done + rm -rf "$(GNUR_HOME_BINARY_UNPACKED)" + mkdir -p "$(GNUR_HOME_BINARY_UNPACKED_PARENT)" + (cd "$(GNUR_HOME_BINARY_UNPACKED_PARENT)"; tar xf R-$(R_VERSION).tar.gz) + touch "$(GNUR_HOME_BINARY_UNPACKED)/gnur.done" endif IN_FILES := $(patsubst %.in,%,$(abspath $(shell find $(PATCH) -name '*.in')))