diff options
| -rw-r--r-- | libraries/tbb/tbb.SlackBuild | 38 | ||||
| -rw-r--r-- | libraries/tbb/tbb.info | 6 |
2 files changed, 21 insertions, 23 deletions
diff --git a/libraries/tbb/tbb.SlackBuild b/libraries/tbb/tbb.SlackBuild index f188d51cb41e..7f3e3eecabbc 100644 --- a/libraries/tbb/tbb.SlackBuild +++ b/libraries/tbb/tbb.SlackBuild @@ -6,13 +6,12 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=tbb -VERSION=${VERSION:-2020u2} +VERSION=${VERSION:-2021.10.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} SRCNAM=oneTBB -SRCVERSION=$( echo ${VERSION} | sed 's,u,_U,' ) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -22,9 +21,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,11 +46,11 @@ fi set -e -rm -rf $PKG $TMP/oneTBB-${SRCVERSION} +rm -rf $PKG $TMP/oneTBB-${VERSION} mkdir -p $TMP $PKG $OUTPUT cd $TMP -tar xvf $CWD/${SRCNAM}-${SRCVERSION}.tar.gz -cd $SRCNAM-${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 \ @@ -62,25 +58,27 @@ 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 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 .. -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 - -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 diff --git a/libraries/tbb/tbb.info b/libraries/tbb/tbb.info index d00913329f35..29de0a7d0937 100644 --- a/libraries/tbb/tbb.info +++ b/libraries/tbb/tbb.info @@ -1,8 +1,8 @@ PRGNAM="tbb" -VERSION="2020u2" +VERSION="2021.10.0" HOMEPAGE="https://software.intel.com/en-us/tbb" -DOWNLOAD="https://github.com/oneapi-src/oneTBB/archive/2020_U2/oneTBB-2020_U2.tar.gz" -MD5SUM="1b711ae956524855088df3bbf5ec65dc" +DOWNLOAD="https://github.com/oneapi-src/oneTBB/archive/v2021.10.0/oneTBB-2021.10.0.tar.gz" +MD5SUM="2caf55b3d35b53edccb33ecaf0f23402" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |