diff --git a/common/shlibs b/common/shlibs index dfd3ae4875c..44c8b34a348 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2340,13 +2340,10 @@ libanthy-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 libanthydic-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 libanthyinput-unicode.so.0 libanthy-unicode-1.0.0.20201109_1 libanthygobject-1.0.so.5 ibus-anthy-1.5.6_1 -libtbbmalloc_proxy_debug.so.2 tbb-4.3_1 libtbbmalloc_proxy.so.2 tbb-4.3_1 libtbbmalloc.so.2 tbb-4.3_1 +libtbb.so.12 tbb-2021.11.0_1 libembree.so.3 embree-3.12.2_1 -libtbb_debug.so.2 tbb-4.3_1 -libtbb.so.2 tbb-4.3_1 -libtbbmalloc_debug.so.2 tbb-4.3_1 libembree.so.2 embree-2.5.1_1 libgtkimageview.so.0 gtkimageview-1.6.4_1 libgoocanvas-2.0.so.9 goocanvas-2.0.4_1 diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch deleted file mode 100644 index 4aefeff192b..00000000000 --- a/srcpkgs/tbb/patches/hostname-usage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/version_info_linux.sh -+++ b/build/version_info_linux.sh -@@ -20,7 +20,7 @@ - - # Script used to generate version info string - echo "#define __TBB_VERSION_STRINGS(N) \\" --echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \' -+echo '#N": BUILD_HOST'"\t\t"`hostname`" ("`uname -m`")"'" ENDL \' - # find OS name in *-release and issue* files by filtering blank lines and lsb-release content out - echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \' - echo '#N": BUILD_KERNEL'"\t"`uname -srv`'" ENDL \' diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch deleted file mode 100644 index a8867eb5379..00000000000 --- a/srcpkgs/tbb/patches/musl.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/tbbmalloc/proxy.cpp 2018-10-17 14:05:31.311723013 +0200 -+++ b/src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200 -@@ -28,6 +28,7 @@ - // of aligned_alloc as required by new C++ standard, this makes it hard to - // redefine aligned_alloc here. However, running on systems with new libc - // version, it still needs it to be redefined, thus tricking system headers -+#if defined(__GLIBC__) - #if defined(__GLIBC_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC - // tell that there is no aligned_alloc - #undef _GLIBCXX_HAVE_ALIGNED_ALLOC -@@ -37,6 +38,7 @@ - #include - #undef aligned_alloc - #endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC -+#endif // defined(__GLIBC__) - #endif // __linux__ && !__ANDROID__ - - #include "proxy.h" diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 250561cde8e..8cb4e9f83b4 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -1,70 +1,45 @@ # Template file for 'tbb' pkgname=tbb -reverts="2021.5.0_1" -version=2020.U3 -revision=2 -# version rewrite: 2017_U7 (upstream) => 2017.7 (xbps) -_ver=${version/./_} -build_style=gnu-makefile -hostmakedepends="cmake" +version=2021.11.0 +revision=1 +build_style=cmake +configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF" +makedepends="libgomp-devel libhwloc-devel" short_desc="Intel Threading Building Blocks" maintainer="Andrea Brancaleoni " license="Apache-2.0" -homepage="https://www.threadingbuildingblocks.org" -distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz" -checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a +homepage="https://oneapi-src.github.io/oneTBB/" +changelog="https://raw.githubusercontent.com/oneapi-src/oneTBB/v${version}/RELEASE_NOTES.md" +distfiles="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${version}.tar.gz" +checksum=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363 +make_check=no # checks fail upstream on i686 case "$XBPS_TARGET_MACHINE" in - x86_64*) - make_build_args="arch=intel64" - ;; - i686*) - make_build_args="arch=ia32" - ;; - armv7l*) - make_build_args="arch=armv7" - ;; - aarch64*) - make_build_args="arch=arm64" - ;; - ppc64*) - make_build_args="arch=ppc64" - ;; - ppc*) - make_build_args="arch=ppc32" - ;; - *) - # make sure to fall back instead of letting host uname control it - make_build_args="arch=generic" - ;; + x86_64*|aarch64*) + build_options_default+=" -DTBB4PY_BUILD=ON" + hostmakedepends+=" python3-devel python3-distutils-extra swig" + makedepends+=" python3-devel" + ;; esac -post_extract() { - sed -i 's|CPLUS = g..|CPLUS = $(CXX)|g' build/linux.gcc.inc - sed -i 's|CONLY = gcc|CONLY = $(CC)|g' build/linux.gcc.inc +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libucontext-devel" + configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext" +fi + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + configure_args+=" -DCMAKE_CXX_FLAGS=-latomic" +fi + +post_extract() { - # alternative might be: - # https://git.alpinelinux.org/cgit/aports/tree/testing/libtbb/glibc-struct-mallinfo.patch if [ "$XBPS_TARGET_LIBC" = "musl" ]; then vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \ - -i src/tbbmalloc/proxy.h + -i src/tbbmalloc_proxy/proxy.h fi } -do_install() { - vmkdir usr/lib - vcopy build/linux_*/*.so* usr/lib - vmkdir usr/include/tbb - vcopy include/tbb/* usr/include/tbb - - cmake \ - -DINSTALL_DIR=$DESTDIR/usr/lib/cmake/TBB \ - -DSYSTEM_NAME=Linux \ - -DLIB_REL_PATH=../.. \ - -DINC_REL_PATH=../../../include \ - -P cmake/tbb_config_installer.cmake -} - tbb-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" @@ -72,5 +47,6 @@ tbb-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/cmake + vmove usr/lib/pkgconfig } }