diff options
| author | Stephen Martin | 2017-11-14 21:12:55 -0600 |
|---|---|---|
| committer | Stephen Martin | 2017-11-14 21:12:55 -0600 |
| commit | 230d164eff975209359cef24e319d0373e747719 (patch) | |
| tree | 1a904180c90c0488f14d9312046054b35d87de16 /rinclude.patch | |
| parent | 410b9eccd667f74cec0e9171215c85e24d56432f (diff) | |
| download | aur-230d164eff975209359cef24e319d0373e747719.tar.gz | |
Fixed errors in compilation.
Diffstat (limited to 'rinclude.patch')
| -rw-r--r-- | rinclude.patch | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/rinclude.patch b/rinclude.patch index 0a00c5e822f6..d4a8ac71155a 100644 --- a/rinclude.patch +++ b/rinclude.patch @@ -1,15 +1,24 @@ diff --git a/engine/Makefile b/engine/Makefile -index 040936b..741fce2 100644 +index e7dce5b..7ec569f 100644 --- a/engine/Makefile +++ b/engine/Makefile -@@ -36,8 +36,8 @@ ifeq ($(os),OSX) +@@ -35,9 +35,9 @@ ifeq ($(os),OSX) + else ifeq ($(os),Linux) - R_HOME = /usr/lib/R -- INCLUDES += -I/usr/share/R/include -- LIBS = -L$(SRCDIR)/../../modules/base/R/RInside/lib \ -+ INCLUDES += -I/usr/share/R/include -I/usr/include/R -+ LIBS = -L$(SRCDIR)/../../modules/base/R/RInside/lib -L$(R_HOME)/lib -L$(R_HOME)/library/RInside/lib \ +- R_HOME = $(SRCDIR)/../../../lib/R ++ R_HOME = /usr/lib/R + LIBS = -L$(R_HOME)/lib \ +- -L$(SRCDIR)/../../modules/base/R/RInside/lib \ ++ -L$(R_HOME)/library/RInside/lib \ -lboost_filesystem \ -lboost_system \ -lpthread \ +@@ -65,6 +65,7 @@ INCLUDES += \ + -I$(SRCDIR)/../../../include \ + -I$(SRCDIR)/../server/jamovi/common \ + -I$(R_HOME)/include \ ++ -I /usr/include/R \ + -I$(SRCDIR)/../../modules/base/R/RInside/include \ + -I$(SRCDIR)/../../modules/base/R/Rcpp/include \ + -I$(R_HOME)/library/RInside/include \ |