* update tbb to 2021.3.0-2

tbb/PKGBUILD

@@ -6,32 +6,45 @@
 # Contributor: Bogdan Burlacu <bogdan.burlacu AT pm.me>
 
 pkgname=tbb
-pkgver=2020.3
-pkgrel=1
+pkgver=2021.3.0
+pkgrel=2
 pkgdesc='High level abstract threading library'
-arch=( x86_64 powerpc64le powerpc )
+arch=(x86_64 powerpc64le powerpc)
 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
+        tbb-non-x86.patch::https://patch-diff.githubusercontent.com/raw/oneapi-src/oneTBB/pull/461.patch
+        tbb-ppc-atomic.patch)
+sha512sums=('969bc8d1dcf50bd12f70633d0319e46308eb1667cdc6f0503b373a35dcb2fe6b2adf59c26bd3c8e2a99a8d2d8b9f64088db5a43e784218b163b3661d12908c0e'
+            'bd6bfd46c74f45c786c20f72654b554fd20bd105c0739e2e98b17b801f07ee149581df0c4e6f8ed2111dad9da8a9361b5e532572be30604dda32d49102bdca03'
+            '756faf918c56115007241e607590d1d370d45bca9313125987d739a271e022a47043f4bd4f47633c9239e1033299876899c3769d7ae17cfaefb114a5462cda95'
+	    '2e0b69b6ff768b33c2c1e4069b37876fb1593cf44cd777078071c9840d2207848c3590886a05c180199b7a4cc6806024a21f62decb3d78665019a6ed8a448049'
+            '7287d7d09e3a00c0ac03a5caab4e7580756aa5737ece40b6fcc21379efdb5bcce007e7a16f40d012312396ef02e6c1f09f98e69fb0d0767f47423a1aeddb6e7f')
+
+prepare() {
+  patch -d oneTBB-$pkgver -p1 < tbb-gcc-11-433.patch
+  patch -d oneTBB-$pkgver -p1 < tbb-gcc-11-447.patch
+  patch -d oneTBB-$pkgver -p1 < tbb-non-x86.patch
+  [ "${CARCH}" == 'powerpc' ] && patch -d oneTBB-$pkgver -p1 < tbb-ppc-atomic.patch
+}
 
 build() {
   cd oneTBB-$pkgver
-  make
+
+  [ "${CARCH}" == 'powerpc' ] && EXTRA_CMAKE_FLAGS='-DCMAKE_CXX_FLAGS="-latomic"'
+
+  cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr ${EXTRA_CMAKE_FLAGS} .
+  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
 }

tbb/tbb-ppc-atomic.patch

@@ -0,0 +1,12 @@
+diff -up tbb-2019_U9/src/tbb/tools_api/ittnotify_config.h.orig tbb-2019_U9/src/tbb/tools_api/ittnotify_config.h
+--- tbb-2020.1/src/tbb/tools_api/ittnotify_config.h.orig        2020-01-21 04:26:46.000000000 -0700
++++ tbb-2020.1/src/tbb/tools_api/ittnotify_config.h     2020-01-22 20:59:51.911673011 -0700
+@@ -335,7 +335,7 @@ ITT_INLINE long
+ __itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE;
+ ITT_INLINE long __itt_interlocked_increment(volatile long* ptr)
+ {
+-    return __TBB_machine_fetchadd4(ptr, 1) + 1L;
++    return __atomic_fetch_add(ptr, 1L, __ATOMIC_SEQ_CST) + 1L;
+ }
+ #endif /* ITT_SIMPLE_INIT */
+