diff options
| author | GoliathLabs | 2020-06-29 17:20:34 +0200 |
|---|---|---|
| committer | GoliathLabs | 2020-06-29 17:20:34 +0200 |
| commit | da433a7169faaeda891c634344f87e03c0991cf9 (patch) | |
| tree | 68d4b41c1a93ca0e3f1d3e0468a44e883cabd7f6 /rinclude.patch | |
| parent | a56ea98514af74b1aa2ad16a1c47df3045e22301 (diff) | |
| download | aur-jamovi-git.tar.gz | |
Updated: PKGBUILD
Diffstat (limited to 'rinclude.patch')
| -rw-r--r-- | rinclude.patch | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/rinclude.patch b/rinclude.patch index d4a8ac71155a..dc65b6e90d76 100644 --- a/rinclude.patch +++ b/rinclude.patch @@ -1,24 +1,23 @@ -diff --git a/engine/Makefile b/engine/Makefile -index e7dce5b..7ec569f 100644 ---- a/engine/Makefile -+++ b/engine/Makefile -@@ -35,9 +35,9 @@ ifeq ($(os),OSX) - +diff --git a/engine/Makefile.in b/engine/Makefile.in +@@ -52,11 +52,11 @@ + CXXFLAGS += -mmacosx-version-min=10.10 else ifeq ($(os),Linux) -- 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 += \ +- R_HOME ?= $(SRCDIR)/../../../lib/R ++ R_HOME ?= /usr/lib/R + BASE_MODULE_PATH ?= $(SRCDIR)/../../modules/base/R + R_PATH ?= $$ORIGIN/../lib $$ORIGIN/../Resources/modules/base/R/RInside/lib + LDFLAGS += -L$(R_HOME)/lib \ +- -L$(BASE_MODULE_PATH)/RInside/lib \ ++ -L$(R_HOME)/library/RInside/lib \ + -lboost_filesystem \ + -lboost_system \ + -lpthread \ +@@ -84,6 +84,7 @@ -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 \ + -I$(BASE_MODULE_PATH)/RInside/include \ + -I$(BASE_MODULE_PATH)/Rcpp/include \ + -I/usr/share/R/include |