1 files changed, 29 insertions, 20 deletions
diff --git a/libraries/tbb/tbb.SlackBuild b/libraries/tbb/tbb.SlackBuild
index 8d6fae5db3..7f3e3eecab 100644
--- a/libraries/tbb/tbb.SlackBuild
+++ b/libraries/tbb/tbb.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for tbb
 # Written by powtrix (@gmail.com)
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=tbb
-VERSION=${VERSION:-2019u9}
+VERSION=${VERSION:-2021.10.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
-SRCVERSION=$( echo ${VERSION} | sed 's,u,_U,' )
+SRCNAM=oneTBB
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -39,11 +46,11 @@ fi
 
 set -e
 
-rm -rf $PKG $TMP/$PRGNAM-${SRCVERSION}
+rm -rf $PKG $TMP/oneTBB-${VERSION}
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-${SRCVERSION}.tar.gz
-cd $PRGNAM-${SRCVERSION}
+tar xvf $CWD/${SRCNAM}-${VERSION}.tar.gz
+cd $SRCNAM-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -51,28 +58,30 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-make
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-# The *.so (no numerical suffix) files should be symlinks, but they're not,
-# so we'll do that correct ourselves
-mv build/linux_*_release/*.so.* $PKG/usr/lib${LIBDIRSUFFIX}
-ln -s libtbb.so.2 $PKG/usr/lib${LIBDIRSUFFIX}/libtbb.so
-ln -s libtbbmalloc.so.2 $PKG/usr/lib${LIBDIRSUFFIX}/libtbbmalloc.so
-ln -s libtbbmalloc_proxy.so.2 $PKG/usr/lib${LIBDIRSUFFIX}/libtbbmalloc_proxy.so
+mkdir build
+cd build
+  cmake \
+	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DLIB_SUFFIX=${LIBDIRSUFFIX} \
+	-DTBB_TEST=OFF \
+	-DCMAKE_BUILD_TYPE=Release ..
 
-mv include $PKG/usr
+  make
+  make install DESTDIR=$PKG
+cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" \
  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2>/dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES LICENSE README{,.md} doc/Release_Notes.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.md LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -rf $PKG/usr/share/
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE