summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBioArchLinuxBot2024-02-08 12:38:51 +0000
committerBioArchLinuxBot2024-02-08 12:38:51 +0000
commit59e0e7d21c599d146fea514a458c4c215c0cd373 (patch)
tree98b6705eed0a4192b7ec70e28730d6472a12ed43
parent1c2275faa3169d69d1e77a5c7f219fcf64773b94 (diff)
downloadaur-59e0e7d21c599d146fea514a458c4c215c0cd373.tar.gz
[lilac] updated to 2.32.5-3
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--fix-plugin.patch17
3 files changed, 35 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be26aff0ef91..8786eee4ac0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = r-rstan
pkgdesc = R Interface to Stan
pkgver = 2.32.5
- pkgrel = 2
+ pkgrel = 3
url = https://cran.r-project.org/package=rstan
arch = x86_64
license = GPL-3.0-or-later
checkdepends = r-testthat
makedepends = r-bh
makedepends = r-rcppeigen
+ depends = onetbb
depends = pandoc
depends = r-ggplot2
depends = r-gridextra
@@ -28,7 +29,10 @@ pkgbase = r-rstan
optdepends = r-testthat
optdepends = r-v8
source = https://cran.r-project.org/src/contrib/rstan_2.32.5.tar.gz
+ source = fix-plugin.patch
md5sums = 0d7ea5114187f589f6a2255cf1eeb397
+ md5sums = 4bd2cd1d41029fb5d9b792b56d9cd524
b2sums = 509272c2b88ad2d1949620fc5ad7a32ab894005a829226ec9ccf39af0cd7bbbcfc4faee798f75ba4f4a984a827bae491cbdc52b7ea1c9292054382dae02bc3d9
+ b2sums = b5cb53f8d2e3cc84ebbed12e8439f59f5b1b62b747a3e6f9212750b882ee2833319af69cd973734670fba7bdbd924bc5a2d63733c60ddf437623bc83d3f3e4a7
pkgname = r-rstan
diff --git a/PKGBUILD b/PKGBUILD
index 2e4abbd49bfa..9ea265f33f02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,12 +9,13 @@ _pkgname=rstan
_pkgver=2.32.5
pkgname=r-${_pkgname,,}
pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=3
pkgdesc="R Interface to Stan"
arch=(x86_64)
url="https://cran.r-project.org/package=$_pkgname"
license=('GPL-3.0-or-later')
depends=(
+ onetbb
pandoc
r-ggplot2
r-gridextra
@@ -44,9 +45,17 @@ optdepends=(
r-testthat
r-v8
)
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-md5sums=('0d7ea5114187f589f6a2255cf1eeb397')
-b2sums=('509272c2b88ad2d1949620fc5ad7a32ab894005a829226ec9ccf39af0cd7bbbcfc4faee798f75ba4f4a984a827bae491cbdc52b7ea1c9292054382dae02bc3d9')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+ "fix-plugin.patch")
+md5sums=('0d7ea5114187f589f6a2255cf1eeb397'
+ '4bd2cd1d41029fb5d9b792b56d9cd524')
+b2sums=('509272c2b88ad2d1949620fc5ad7a32ab894005a829226ec9ccf39af0cd7bbbcfc4faee798f75ba4f4a984a827bae491cbdc52b7ea1c9292054382dae02bc3d9'
+ 'b5cb53f8d2e3cc84ebbed12e8439f59f5b1b62b747a3e6f9212750b882ee2833319af69cd973734670fba7bdbd924bc5a2d63733c60ddf437623bc83d3f3e4a7')
+
+prepare() {
+ # fix Rcpp plugin to use system onetbb
+ patch -Np1 -i fix-plugin.patch
+}
build() {
mkdir build
diff --git a/fix-plugin.patch b/fix-plugin.patch
new file mode 100644
index 000000000000..34316ccb498c
--- /dev/null
+++ b/fix-plugin.patch
@@ -0,0 +1,17 @@
+diff --git a/rstan/R/plugin.R b/rstan/R/plugin.R
+index d254ce4..659c48a 100644
+--- a/rstan/R/plugin.R
++++ b/rstan/R/plugin.R
+@@ -96,8 +96,10 @@ rstanplugin <- function() {
+ else {
+ StanHeaders_pkg_libs <- system.file("lib", .Platform$r_arch,
+ package = "StanHeaders", mustWork = TRUE)
+- RcppParallel_pkg_libs <- system.file("lib", .Platform$r_arch,
+- package = "RcppParallel", mustWork = TRUE)
++ RcppParallel_pkg_libs <- file.path(system.file(package = "RcppParallel", mustWork = TRUE), "lib")
++ if (!dir.exists(RcppParallel_pkg_libs)) {
++ RcppParallel_pkg_libs <- "/usr/lib"
++ }
+ rstan_StanServices <- system.file("lib", .Platform$r_arch, "libStanServices.a",
+ package = "rstan", mustWork = TRUE)
+ }