From 68d8e5b19ee13ce64c88a3939eb1173fe0c7c522 Mon Sep 17 00:00:00 2001 From: Mick Jordan <mick.jordan@oracle.com> Date: Mon, 30 Jan 2017 14:51:09 -0800 Subject: [PATCH] gnur configure fix for zlib suppressed on Solaris --- com.oracle.truffle.r.native/gnur/Makefile.gnur | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur index 4fc3a0637a..abc5c59b12 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile.gnur +++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur @@ -68,7 +68,10 @@ all: Makefile $(GNUR_HOME) iconv config build $(GNUR_HOME): tar xf $(TOPDIR)/../libdownloads/R-$(R_VERSION).tar.gz +# Solaris doesn't need this and ed can't handle the size of the configure file! +ifneq ($(OSNAME), SunOS) ed $(GNUR_HOME)/configure < edconfigure # to fix the zlib version check (fixed in GNUR in the meantime) +endif # After this platform check, GNUR_CONFIG_FLAGS must be set -- GitLab