[arch-commits] Commit in tbb/trunk (PKGBUILD)

[Felix Yan]

    Date: Tuesday, July 20, 2021 @ 05:15:46
  Author: felixonmars
Revision: 420159

upgpkg: tbb 2021.3.0-1

Modified:
  tbb/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-20 05:13:18 UTC (rev 420158)
+++ PKGBUILD	2021-07-20 05:15:46 UTC (rev 420159)
@@ -5,7 +5,7 @@
 # Contributor: Bogdan Burlacu <bogdan.burlacu AT pm.me>
 
 pkgname=tbb
-pkgver=2020.3
+pkgver=2021.3.0
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('x86_64')
@@ -12,25 +12,29 @@
 url='https://www.threadingbuildingblocks.org/'
 license=('Apache')
 depends=('gcc-libs')
-makedepends=('cmake' 'inetutils')
+makedepends=('cmake' 'inetutils' 'ninja')
 conflicts=('intel-tbb')
 provides=("intel-tbb=$pkgver")
 replaces=('intel-tbb')
-source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha512sums=('ea1ffd22c7234d715b8c46a4e51b40719c7a9b8837ab3166f1da5a2c6061167c2be2126b1d74fd361eec6975b8fce0df26829ca2e7af8029edbb52e40f23d630')
+source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        tbb-gcc-11-433.patch::https://github.com/oneapi-src/oneTBB/pull/433.patch
+        tbb-gcc-11-447.patch::https://github.com/oneapi-src/oneTBB/pull/447.patch)
+sha512sums=('969bc8d1dcf50bd12f70633d0319e46308eb1667cdc6f0503b373a35dcb2fe6b2adf59c26bd3c8e2a99a8d2d8b9f64088db5a43e784218b163b3661d12908c0e'
+            'bd6bfd46c74f45c786c20f72654b554fd20bd105c0739e2e98b17b801f07ee149581df0c4e6f8ed2111dad9da8a9361b5e532572be30604dda32d49102bdca03'
+            '756faf918c56115007241e607590d1d370d45bca9313125987d739a271e022a47043f4bd4f47633c9239e1033299876899c3769d7ae17cfaefb114a5462cda95')
 
+prepare() {
+  patch -d oneTBB-$pkgver -p1 < tbb-gcc-11-433.patch
+  patch -d oneTBB-$pkgver -p1 < tbb-gcc-11-447.patch
+}
+
 build() {
   cd oneTBB-$pkgver
-  make
+  cmake -GNinja .
+  ninja
 }
 
 package() {
   cd oneTBB-$pkgver
-  install -Dm755 build/linux_*/*.so* -t "$pkgdir"/usr/lib
-  install -d "$pkgdir"/usr/include
-  cp -a include/tbb "$pkgdir"/usr/include
-  cmake \
-    -DINSTALL_DIR="$pkgdir"/usr/lib/cmake/TBB \
-    -DSYSTEM_NAME=Linux -DTBB_VERSION_FILE="$pkgdir"/usr/include/tbb/tbb_stddef.h \
-    -P cmake/tbb_config_installer.cmake
+  DESTDIR="$pkgdir" ninja install
 }