summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2018-01-20 19:14:39 -0600
committerStephen Martin2018-01-20 19:14:39 -0600
commit5c6ffab91a5636c71bf120f4f6ed7aef35c3fb9a (patch)
tree28c97e5bbeedcfbc54ee2339db190d6ff5a09771
parent7b5f5bbf38bdc5c79bea65037591b46e312a79d3 (diff)
downloadaur-5c6ffab91a5636c71bf120f4f6ed7aef35c3fb9a.tar.gz
Added gcc6-libs
- Some modules need libgfortran.so.3 - Added gcc6-libs for above library - Added LD_PRELOAD to env.conf to preload only that library.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD6
-rw-r--r--env.conf2
3 files changed, 9 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 845b5335d69b..85bb30814bb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Jan 15 05:47:04 UTC 2018
+# Sun Jan 21 01:14:33 UTC 2018
pkgbase = jamovi-git
pkgdesc = Open Source Software to bridge the gap between researcher and statistician
- pkgver = r709.202e3b2
+ pkgver = r716.8774368
pkgrel = 1
url = https://www.jamovi.org/
arch = any
@@ -21,6 +21,7 @@ pkgbase = jamovi-git
depends = boost-libs
depends = python-chardet
depends = r-cran-rinside
+ depends = gcc6-libs
optdepends = jamovi-rbundle: R backend for various analyses
provides = jamovi
conflicts = jamovi
@@ -29,7 +30,7 @@ pkgbase = jamovi-git
source = jamovi.sh
source = rinclude.patch
md5sums = SKIP
- md5sums = 207b3012a3235d9f9a0ec12fa4027694
+ md5sums = 75dc797390f0697fd9bc71c82563f857
md5sums = 38fec18885de4ecbb91aef1f201c20d7
md5sums = f873dbb9ac296cd6f563ed03f018fe97
diff --git a/PKGBUILD b/PKGBUILD
index b64731de392b..1ee1e054f468 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Stephen Martin <stephenSRMMartin at gmail dot com>
pkgname=jamovi-git
_pkgname=jamovi
-pkgver=r709.202e3b2
+pkgver=r716.8774368
pkgrel=1
pkgdesc="Open Source Software to bridge the gap between researcher and statistician"
arch=('any')
url="https://www.jamovi.org/"
license=('GPL')
-depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs' 'python-chardet' 'r-cran-rinside')
+depends=('electron' 'python' 'python-protobuf' 'python-tornado' 'python-nanomsg' 'python-yaml' 'boost-libs' 'python-chardet' 'r-cran-rinside' 'gcc6-libs') #gcc6 libs added for libgfortran.so.3
optdepends=("jamovi-rbundle: R backend for various analyses")
makedepends=('boost' 'npm' 'cython' 'git' 'r-cran-rinside')
provides=("${pkgname%-git}")
@@ -17,7 +17,7 @@ source=(git+https://github.com/jamovi/jamovi.git
"jamovi.sh"
"rinclude.patch")
md5sums=('SKIP'
- '207b3012a3235d9f9a0ec12fa4027694'
+ '75dc797390f0697fd9bc71c82563f857'
'38fec18885de4ecbb91aef1f201c20d7'
'f873dbb9ac296cd6f563ed03f018fe97')
diff --git a/env.conf b/env.conf
index e415576df8a6..fa3beafde688 100644
--- a/env.conf
+++ b/env.conf
@@ -1,5 +1,7 @@
[ENV]
+LD_PRELOAD=/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.1/libgfortran.so.3
+
R_HOME=/usr/lib/R
R_LIBS=/usr/lib/R/site-library:/usr/lib/R/library
PYTHONPATH=../Resources/jamovi/server