# HG changeset patch # User Mike Sullivan # Date 1459790844 25200 # Node ID 0ec11277a3e44754f7ddca5c3754b02e50720c07 # Parent 0ce9ba2758901e38889c6fc72c571851e1d453a7 22976223 Adjust the R Makeconf file to better handle installation of CRAN R packages (disable parfait) diff -r 0ce9ba275890 -r 0ec11277a3e4 components/r/Makefile --- a/components/r/Makefile Fri Apr 01 20:01:47 2016 -0700 +++ b/components/r/Makefile Mon Apr 04 10:27:24 2016 -0700 @@ -22,6 +22,8 @@ # # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. # +# switching to parfait breaks a patch (23049278) +export PARFAIT_BUILD=no BUILD_BITS= 64 include ../../make-rules/shared-macros.mk