[lilac] updated to 2.32.5-2

3 files changed, 72 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 754270f67fad..373a1bb7ad3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = r-stanheaders
 	pkgdesc = C++ Header Files for Stan
 	pkgver = 2.32.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://cran.r-project.org/package=StanHeaders
 	arch = x86_64
-	license = BSD
+	license = BSD-3-Clause
 	makedepends = gcc-fortran
-	depends = r
-	depends = r-rcppeigen
+	makedepends = r-rcppeigen
 	depends = r-rcppparallel
 	optdepends = r-bh
 	optdepends = r-knitr
-	optdepends = r-matrix
-	optdepends = r-methods
 	optdepends = r-rcpp
 	optdepends = r-rmarkdown
 	optdepends = r-rstan
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/StanHeaders_2.32.5.tar.gz
-	sha256sums = 54123b1ff403582a1c83a927b887a21da863786cf98d3b9eeed777e1bbd11773
+	source = fix-flags.patch
+	md5sums = b6451f9244ccd0682327dcbaf63685c4
+	md5sums = 0d0c50619b42dc9d75209fc43320c71b
+	b2sums = 3aa5e2d4b68e7cfbb97346b2e044ef8530eb6be39d6ddebfc53e8e10c151a0ebc053b664a8aefaced3cce2a59b9dc01efafe9bfba6c2ba67f06df1b80a9fcbd9
+	b2sums = 11ef9d240340ee8aaee7d0786dfbd8b412c90b22289a4fc1b9787907b78c6fd75a401078f1be796833fbc87f18095a0960c1b132efc2481e339a10bccf8782aa
 
 pkgname = r-stanheaders
diff --git a/PKGBUILD b/PKGBUILD
index 5472813e47ea..101c0c9f708e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# system requirements: pandoc
 # Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Alex Branham <alex.branham@gmail.com>
@@ -6,40 +5,48 @@
 _pkgname=StanHeaders
 _pkgver=2.32.5
 pkgname=r-${_pkgname,,}
-pkgver=2.32.5
-pkgrel=1
-pkgdesc='C++ Header Files for Stan'
-arch=('x86_64')
-url="https://cran.r-project.org/package=${_pkgname}"
-license=('BSD')
+pkgver=${_pkgver//-/.}
+pkgrel=2
+pkgdesc="C++ Header Files for Stan"
+arch=(x86_64)
+url="https://cran.r-project.org/package=$_pkgname"
+license=('BSD-3-Clause')
 depends=(
-  r
-  r-rcppeigen
   r-rcppparallel
 )
+makedepends=(
+  gcc-fortran
+  r-rcppeigen
+)
 optdepends=(
   r-bh
   r-knitr
-  r-matrix
-  r-methods
   r-rcpp
   r-rmarkdown
   r-rstan
   r-withr
 )
-makedepends=(
-  gcc-fortran
-)
-source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
-sha256sums=('54123b1ff403582a1c83a927b887a21da863786cf98d3b9eeed777e1bbd11773')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "fix-flags.patch")
+md5sums=('b6451f9244ccd0682327dcbaf63685c4'
+         '0d0c50619b42dc9d75209fc43320c71b')
+b2sums=('3aa5e2d4b68e7cfbb97346b2e044ef8530eb6be39d6ddebfc53e8e10c151a0ebc053b664a8aefaced3cce2a59b9dc01efafe9bfba6c2ba67f06df1b80a9fcbd9'
+        '11ef9d240340ee8aaee7d0786dfbd8b412c90b22289a4fc1b9787907b78c6fd75a401078f1be796833fbc87f18095a0960c1b132efc2481e339a10bccf8782aa')
+
+prepare() {
+  # fix onetbb build flags
+  patch -Np1 -i fix-flags.patch
+}
 
 build() {
-  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
+  mkdir build
+  R CMD INSTALL -l build "$_pkgname"
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
-  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
+
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
-# vim:set ts=2 sw=2 et:
diff --git a/fix-flags.patch b/fix-flags.patch
new file mode 100644
index 000000000000..725f3f49654c
--- /dev/null
+++ b/fix-flags.patch
@@ -0,0 +1,36 @@
+diff --git a/StanHeaders/R/Flags.R b/StanHeaders/R/Flags.R
+index 46c91ae..cd611e3 100644
+--- a/StanHeaders/R/Flags.R
++++ b/StanHeaders/R/Flags.R
+@@ -5,7 +5,12 @@ CxxFlags <- function(as_character = FALSE) {
+     TBB_INC <- system.file("include", package = "RcppParallel", mustWork = TRUE)
+   }
+ 
+-  if (file.exists(file.path(TBB_INC, "tbb", "version.h"))) {
++  TBB_DIR <- file.path(TBB_INC, "tbb")
++  if (!dir.exists(TBB_DIR)) {
++    TBB_DIR <- "/usr/include/tbb"
++  }
++
++  if (file.exists(file.path(TBB_DIR, "version.h"))) {
+     CXXFLAGS <- paste0("-I", shQuote(TBB_INC), " -D_REENTRANT -DSTAN_THREADS -DTBB_INTERFACE_NEW")
+   } else {
+     CXXFLAGS <- paste0("-I", shQuote(TBB_INC), " -D_REENTRANT -DSTAN_THREADS")
+@@ -20,10 +25,15 @@ LdFlags <- function(as_character = FALSE) {
+   if (dir.exists(Sys.getenv("TBB_LIB"))) {
+     TBB_LIB <- normalizePath(Sys.getenv("TBB_LIB"))
+   } else {
+-    TBB_LIB <- system.file("lib", .Platform$r_arch, package = "RcppParallel", mustWork = TRUE)
++    TBB_LIB <- file.path(system.file(package = "RcppParallel", mustWork = TRUE), "lib")
+   }
+ 
+-  PKG_LIBS <- paste0("-L", shQuote(TBB_LIB), " -Wl,-rpath,", shQuote(TBB_LIB), " -ltbb -ltbbmalloc")
++  if (dir.exists(TBB_LIB)) {
++    TBB_LIB <- normalizePath(TBB_LIB)
++    PKG_LIBS <- paste0("-L", shQuote(TBB_LIB), " -Wl,-rpath,", shQuote(TBB_LIB), " -ltbb -ltbbmalloc")
++  } else {
++    PKG_LIBS <- "-ltbb -ltbbmalloc"
++  }
+ 
+   if (isTRUE(as_character)) return(PKG_LIBS)
+   cat(PKG_LIBS, " ")