From: Mo Zhou Date: Sat, 22 Feb 2025 18:51:55 +0000 (-0500) Subject: Import onetbb_2022.0.0-2.debian.tar.xz X-Git-Tag: archive/raspbian/2022.0.0-2+rpi1^2~9^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b55b2d696745af83f2c39efdf87c144f207cb149;p=onetbb.git Import onetbb_2022.0.0-2.debian.tar.xz [dgit import tarball onetbb 2022.0.0-2 onetbb_2022.0.0-2.debian.tar.xz] --- b55b2d696745af83f2c39efdf87c144f207cb149 diff --git a/changelog b/changelog new file mode 100644 index 0000000..5872c5e --- /dev/null +++ b/changelog @@ -0,0 +1,916 @@ +onetbb (2022.0.0-2) unstable; urgency=medium + + * d/rules: Clean the html directory as well. (Closes: #1045631) + * d/control: Update the homepage URL. + * Bump Standards-Version to 4.7.0 (no change needed). + * Apply wrap-and-sort. + + -- Mo Zhou Sat, 22 Feb 2025 13:51:55 -0500 + +onetbb (2022.0.0-1) unstable; urgency=medium + + * Patch sphinx config file to fix the build (Closes: #1091039) + * Skip test_resumable_tasks to avoid FTBFS on s390x. + * Upload to unstable. + + -- Mo Zhou Wed, 01 Jan 2025 20:29:54 -0500 + +onetbb (2022.0.0-1~exp1) experimental; urgency=medium + + * New upstream version 2022.0.0 + * Refresh symbols control file. + + -- Mo Zhou Sat, 23 Nov 2024 20:45:19 -0500 + +onetbb (2021.13.0-1~exp1) experimental; urgency=medium + + * New upstream version 2021.13.0 + * Refresh existing patches. + * Switch from sphinx book theme to rtd theme due to pydata-sphinx-theme + (0.15.4+dfsg-1) being temporarily buggy where it missed necessary files. + * Remove unsupported C/CXXFLAGS for alpha and hppa architectures. + * Upload to experimental. + + -- Mo Zhou Thu, 17 Oct 2024 23:50:27 -0400 + +onetbb (2021.12.0-1) unstable; urgency=medium + + [ zhangdandan ] + * Fix testcases failed on loong64 (Closes: #1070849) + + [ Mo Zhou ] + * Upload to unstable. + + -- Mo Zhou Fri, 12 Jul 2024 01:16:04 -0400 + +onetbb (2021.12.0-1~exp1) experimental; urgency=medium + + [ Gianfranco Costamagna ] (Ubuntu changes) + * Fix build on ppc64el by using -Wno-error=stringop-overflow. + * Make sure FORTIFY_SOURCE=3 is used, to fix FTBFS due to mixing + different values of them + + [ John Paul Adrian Glaubitz ] + * Add sh4 architecture support. + + [ Mo Zhou ] + * New upstream version 2021.12.0 + * Quilt refresh patches. + * B-D on pkgconf instead of pkg-config. + * ubuntu fortify patch is not necessary here on debian + * Upload to experimental. + + -- Mo Zhou Thu, 25 Apr 2024 14:19:08 -0400 + +onetbb (2021.11.0-2) unstable; urgency=medium + + * Autopkgtest: reduce testing workload to avoid timeout on weak CPUs. + + -- Mo Zhou Tue, 26 Dec 2023 14:26:37 -0500 + +onetbb (2021.11.0-1) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Sat, 09 Dec 2023 16:46:42 -0500 + +onetbb (2021.11.0-1~exp1) experimental; urgency=medium + + * New upstream version 2021.11.0 + * Release to experimental. + + -- Mo Zhou Fri, 24 Nov 2023 00:13:46 -0500 + +onetbb (2021.10.0-1) experimental; urgency=medium + + * New upstream version 2021.10.0 (July 2023) + * Quilt refresh patchset. + * Remove 1040-missing-header.patch, fixed upstream. + * Upload to experimental. + + -- Mo Zhou Sun, 12 Nov 2023 16:00:41 -0500 + +onetbb (2021.9.0-3) UNRELEASED; urgency=medium + + [ Petter Reinholdtsen ] + * Team upload. + + * Updated Standards-Version from 4.6.0 to 4.6.2. + * Document that 1040-missing-header.patch is applied upstream. + + -- Mo Zhou Sun, 12 Nov 2023 15:16:18 -0500 + +onetbb (2021.9.0-2) unstable; urgency=medium + + * Team upload. + + * Added patch classiciation and added more metadata. + * Avoid build problem on armel caused by strange compiler + (Closes: #1042009). + + -- Petter Reinholdtsen Wed, 02 Aug 2023 22:42:54 +0200 + +onetbb (2021.9.0-1) unstable; urgency=medium + + * New upstream version 2021.9.0 + * Remove merged patches. + * Remove merged patches. Rebase remaining ones. + * Add patch for missing header to resolve FTBFS. (Closes: #1037798) + + -- Mo Zhou Thu, 13 Jul 2023 21:29:44 -0700 + +onetbb (2021.8.0-2) unstable; urgency=medium + + * Team upload. + * libtbb12: Add explicit Breaks against libtbb2 for smoother upgrades from + bullseye. The the existing transitive Breaks via libtbbmalloc2 is not + sufficient for all upgrade paths. (Closes: #1036073) + * Drop duplicate symbols. + + -- Andreas Beckmann Tue, 16 May 2023 12:23:01 +0200 + +onetbb (2021.8.0-1) unstable; urgency=medium + + * New upstream version 2021.8.0 + * Rebase existing patches. + + -- Mo Zhou Mon, 26 Dec 2022 11:21:23 -0500 + +onetbb (2021.7.0-1) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Sat, 29 Oct 2022 23:15:39 -0400 + +onetbb (2021.7.0-1~exp1) experimental; urgency=medium + + * Update watch due to github change. + * Repack upstream tarball to deal with EXTREMELY ANNOYING DOS linebreaks + in Git. (Reverts: "Do not repack upstream source" in 2021.5.0-1) + * New upstream version 2021.7.0 + * Rebase/Refresh existing patches. Remove merged ones. + * Rules: no longer link binaries using GOLD on ppc64el. + * Upload to experimental. + + -- Mo Zhou Fri, 28 Oct 2022 14:01:02 -0400 + +onetbb (2021.5.0-15) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Wed, 07 Sep 2022 14:45:46 -0400 + +onetbb (2021.5.0-14) experimental; urgency=medium + + * Enable hwloc support as per upstream request. + + Install the new libtbbbind_*.so after enabling hwloc. + + Install the new shared object in separate binary package. + * Switch linker from bfd to gold for ppc64el. + This bypasses a regression (linker segmentation fault) in binutils. + + -- Mo Zhou Tue, 06 Sep 2022 23:53:16 -0400 + +onetbb (2021.5.0-13) unstable; urgency=medium + + * Suppress compiler warnings appeared since GCC-12. (Closes: #1016283) + + -- Mo Zhou Thu, 18 Aug 2022 12:57:20 -0400 + +onetbb (2021.5.0-12) unstable; urgency=medium + + [ Adrian Bunk ] + * Build libtbbmalloc2 also on mips* (Closes: #1013753) + + -- Mo Zhou Sat, 25 Jun 2022 07:28:41 -0700 + +onetbb (2021.5.0-11) unstable; urgency=medium + + [ Andrius Merkys ] + * Team upload. + + [ Adrian Bunk ] + * Link everything with -latomic where needed + * Correct DEB_BUILD_ARCH -> DEB_HOST_ARCH + + -- Andrius Merkys Wed, 15 Jun 2022 02:55:28 -0400 + +onetbb (2021.5.0-10) unstable; urgency=medium + + * Team upload. + * Upload to unstable. + + -- Andrius Merkys Mon, 13 Jun 2022 03:58:56 -0400 + +onetbb (2021.5.0-9) experimental; urgency=medium + + * Remove mips* arch from bin:libtbbmalloc2. (Closes: #1011112) + * Close the riscv FTBFS bug that was not closed (Closes: #1005733) + + -- Mo Zhou Fri, 20 May 2022 10:32:26 -0400 + +onetbb (2021.5.0-8) experimental; urgency=medium + + [ Andrius Merkys ] + * Team upload. + + [ Matthias Klose ] + * Split out a libtbbmalloc2 package (Closes: #1010920). + * Mark some of the libtbbmalloc symbols as optional. + * Build for riscv64. + + -- Andrius Merkys Fri, 13 May 2022 04:06:43 -0400 + +onetbb (2021.5.0-7) experimental; urgency=medium + + * Remove fetchadd4-ia64-gcc.patch: generic fallback invalid for IA64. + * Revise patch of test_collaborative_call_once for __arm__ and x32. + * Add -faligned-new in CXXFLAGS for m68k and sh4. + * Disable ITT_NOTIFY on IA64 architecture. + + -- Mo Zhou Tue, 22 Feb 2022 12:51:02 -0500 + +onetbb (2021.5.0-6) experimental; urgency=medium + + * Patch and fix libatomic linkage on architectures incl. armel. + * Reduce stress of test_collaborative_call_once on __arm__ and x32. + * Revise fetchadd4.patch based on upstream suggestion. + * Patch code to avoid undefined fetchadd4 on IA64 with gcc. + + -- Mo Zhou Tue, 15 Feb 2022 10:16:19 -0500 + +onetbb (2021.5.0-5) experimental; urgency=medium + + * Patch source to avoid "undefined __TBB_machine_fetchadd4". + * Overhaul buildflags definition for CMake. Deprecate old defs for Makefile. + + -- Mo Zhou Sun, 13 Feb 2022 21:53:17 -0500 + +onetbb (2021.5.0-4) experimental; urgency=medium + + * Cherry-pick 8f78aa096459b8ea0fcb54d2f0854f1889043f5d to fix test_eh_thread. + * Prevent dh-missing from failing the build due to README. + + -- Mo Zhou Sun, 13 Feb 2022 15:48:13 -0500 + +onetbb (2021.5.0-3) experimental; urgency=medium + + * Cherry-pick upstream fix for i386. + * Fix FTBFS for --arch-all --no-arch-any build. + * Fix broken symlink in libtbb-doc. (Closes: #988868) + + -- Mo Zhou Sun, 13 Feb 2022 13:50:43 -0500 + +onetbb (2021.5.0-2) experimental; urgency=medium + + * Breaks+Replaces: libtbb2 (<< 2021). (Closes: #1004980) + * B-D on cmake for all architectures. + * Reintroduce remove-unaligned-test.patch to fix bus error during test. + + -- Mo Zhou Sat, 05 Feb 2022 17:57:13 -0500 + +onetbb (2021.5.0-1) experimental; urgency=medium + + * Team upload + + [ Mo Zhou ] + * New upstream version 2021.4.0 (Closes: #987689) + * Source rename following upstream. The new upstream Git URL is + https://github.com/oneapi-src/oneTBB + * d/rules: Switch build system to cmake+ninja. + + Remove OS detection flags for old buildsystem. + + Update buildflags in favor of new CMake buildsystem. + + No longer need to manually install pkg-config and cmake files. + * d/patches: Remove patches for old build system. + + And temporarily disable all remaining patches. + * Bump SOVERSION to 12 and refresh symbols control file. (Closes: #997115) + * Migrate to Sphinx for building documentation. + * d/*.{install,docs,examples}: Reflect upstream file changes. + * Remove unnecessary links and lintian overrides. + * Migrate to new API for d/tests/test.cc for autopkgtest. + * Use upstream examples for autopkgtest. + * Upload to experimental. + + [ Andreas Tille ] + * Do not repack upstream source + * DEP5 + * Drop uupdate from watch file + * Standards-Version: 4.6.0 (routine-update) + * debhelper-compat 13 (routine-update) + * Add salsa-ci file (routine-update) + * No need to use dh-exec + + -- Andreas Tille Thu, 03 Feb 2022 17:14:25 +0100 + +tbb (2020.3-1) unstable; urgency=medium + + * New upstream version 2020.3 + * Refresh symbols control file. + + -- Mo Zhou Thu, 13 Aug 2020 08:33:57 +0800 + +tbb (2020.2-2) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Mon, 13 Apr 2020 07:56:18 +0800 + +tbb (2020.2-1) experimental; urgency=medium + + * New upstream version 2020.2 + * Specify Rules-Requires-Root: no in control + * Bump Standards-Version to 4.5.0 (no change). + + -- Mo Zhou Sun, 05 Apr 2020 18:19:33 +0800 + +tbb (2020.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Fri, 07 Feb 2020 09:32:59 +0800 + +tbb (2020.1-1) experimental; urgency=medium + + * New upstream version 2020.1 + * Autopkgtest: let cmake test compile a simple C++ program. + + -- Mo Zhou Thu, 30 Jan 2020 18:01:05 +0800 + +tbb (2020.0-2) unstable; urgency=medium + + * Mark libtbb-doc as Multi-Arch: foreign. + * Merge the content of tbb-examples package into libtbb-doc package. + * Remove the third-party cmake file FindTBB.cmake + * CMake: use TBBConfig*.cmake to find TBB. (Closes: #929967) + * Add a CMakeLists.txt to debian/tests for testing TBBConfig*.cmake + * Bump debhelper compat level to 12 and deprecate d/compat. + * Initialize autopkgtest: upstream unit tests, cmake find_package. + + -- Mo Zhou Tue, 07 Jan 2020 09:01:17 +0800 + +tbb (2020.0-1) experimental; urgency=medium + + * New upstream version 2020.0 + * Update watch file, reflecting the version scheme change. + * Rebase/Refresh existing patch stack. + * Add missing B-D-I graphviz. + * Refresh symbols control file. + * Override a lintian warning. + * Update my own mail address. + * Upload to experimental. + + -- Mo Zhou Thu, 02 Jan 2020 17:05:21 +0800 + +tbb (2019~U9-2) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Tue, 15 Oct 2019 10:06:29 +0000 + +tbb (2019~U9-1) experimental; urgency=medium + + * New upstream version 2019~U9 + * Rebase gcc-atomic-detection.patch + * Update symbols list for amd64. + + -- Mo Zhou Fri, 11 Oct 2019 21:24:17 +0800 + +tbb (2019~U8-1) unstable; urgency=medium + + * New upstream version 2019~U8 + + -- Mo Zhou Sat, 06 Jul 2019 04:48:07 +0000 + +tbb (2019~U7-1) unstable; urgency=medium + + * New upstream version 2019~U7 + * Rebase gcc-atomic-detection.patch and refresh the rest patches. + + -- Mo Zhou Tue, 04 Jun 2019 12:14:14 +0000 + +tbb (2019~U5-1~exp1) experimental; urgency=medium + + * New upstream version 2019~U5 + + -- Mo Zhou Thu, 28 Mar 2019 00:34:43 +0000 + +tbb (2019~U4-1~exp1) experimental; urgency=medium + + * New upstream version 2019~U4 + * Refresh patches (quilt push -a --refresh). + * Refresh symbols (one more symbol). + + -- Mo Zhou Sun, 03 Mar 2019 02:47:44 +0000 + +tbb (2019~U3-1~exp1) experimental; urgency=medium + + * New upstream version 2019~U3 + * Refresh/Rebase patches: + + Rebase fixnonlinux.patch, gcc-atomic-detection.patch, cross.patch + + Refresh the rest patches. + - Remove no longer needed removejsquery.patch + * Override dh_auto_build-indep to build doxygen documentations. + * Add doxygen to Build-Depends-Indep. + * Update symbols control file for amd64 architecture. + * Override (noop) dh_auto_test-indep. + + -- Mo Zhou Sat, 02 Feb 2019 15:14:00 +0000 + +tbb (2018~U6-4) unstable; urgency=medium + + * Team upload. + * Drop cgal specific include from cmake module + * Install tbb own cmake files and include TBBMakeConfig.cmake into + FindTBB.cmake + + -- Andreas Tille Wed, 12 Dec 2018 19:20:30 +0100 + +tbb (2018~U6-3) unstable; urgency=medium + + * Team upload. + * cme fix dpkg-control + * Standards-Version: 4.2.1 + * Remove trailing whitespace in debian/changelog + * DEP3 + * Add cmake file (shamelessly stolen from libcgal-dev) + + -- Andreas Tille Tue, 11 Dec 2018 21:58:08 +0100 + +tbb (2018~U6-2) unstable; urgency=medium + + * Upload to unstable. + + -- Mo Zhou Fri, 30 Nov 2018 07:41:31 +0000 + +tbb (2018~U6-1) experimental; urgency=medium + + * New upstream version 2018~U6 + * Maintainer is Debian Science team. Append myself to uploaders. + * Point Vcs-* fields to Salsa. + * Refresh patches. + * Change priority to optional in favor of deprecation of extra. + * Cleanup rules and enable all hardening options. + * Bump debhelper compat level to 11. + * Delete -dbg package in favor of automatic debug packages. + * Remove unused files and unused lintian overrides. + * Update doc installation path and doc-base registration due to compat 10. + * Add symbols control file for amd64. + + -- Mo Zhou Fri, 23 Nov 2018 09:04:17 +0000 + +tbb (2017~U7-8) unstable; urgency=medium + + * Remove un-aligned memory access unit test from test_malloc_pools.exe + - This allows sparc64 to pass unit tests. Closes: #832104 + + [ Adrian Bunk ] + * Advertise exception_ptr with gcc >= 7, Closes: #877380 + + -- Steve Capper Wed, 04 Oct 2017 14:46:23 +0100 + +tbb (2017~U7-7~exp1) experimental; urgency=medium + + * Remove un-aligned memory access unit test from test_malloc_pools.exe + - This should help sparc64 + + -- Steve Capper Mon, 14 Aug 2017 17:41:33 +0100 + +tbb (2017~U7-6) unstable; urgency=medium + + * Rollback enhanced debugging -g3 change, as it appears to have broken + reproducible builds. + + -- Steve Capper Wed, 02 Aug 2017 19:03:30 +0100 + +tbb (2017~U7-5) unstable; urgency=medium + + * Release to sid + * Enhanced debugging, gdb analysis for failed tbbmalloc tests + * Display host system page size + + -- Steve Capper Tue, 01 Aug 2017 21:20:40 +0100 + +tbb (2017~U7-5~exp1) experimental; urgency=medium + + * Enhanced debugging, gdb analysis for failed tbbmalloc tests + * Display host system page size + + -- Steve Capper Sun, 30 Jul 2017 21:42:32 +0100 + +tbb (2017~U7-4) unstable; urgency=medium + + * Remove spurious patch files + * Fix build on ARMEL. Closes: #852481 + * Remove build information to help reproducible builds. Closes: #816989 + * Fixup 64-bits detection patch + * Use 1MB stack for 32-bit MIPS test threads + * Merge failonbadtests and tally-unit-test-fails.patch + * Fix -march logic in i386 building. Closes: #855088 + + (we use gcc atomics by default so no longer need to mention pentium4) + * Bump standards to 4.0.0 + + [ Matthias Klose ] + * Fix multi-arch support, Closes: #812945 + + [ Helmut Grohne ] + * Fix FTCBFS: Pass build configuration to make. Closes: #837179 + + -- Steve Capper Thu, 27 Jul 2017 20:52:44 +0100 + +tbb (2017~U7-3~exp1) experimental; urgency=medium + + [ Matthias Klose ] + * Fix multi-arch support, Targets: #812945 + + [ Helmut Grohne ] + * Fix FTCBFS: Pass build configuration to make. Targets: #837179 + + [ Steve Capper ] + * Remove spurious patch files + * Fix build on ARMEL. Targets: #852481 + * Attempt to debug pthread_create failures on mips + * Remove build information to help reproducible builds. Targets: #816989 + + -- Steve Capper Sun, 23 Jul 2017 19:08:41 +0100 + +tbb (2017~U7-2) unstable; urgency=medium + + * Port over experimental package to sid. + * Upgrade to latest upstream version of TBB. + + This now builds with gcc 7. Closes: #853679 + + This supports s390x. Closes: #809663 + * Update copyright file to Apache 2.0 to match new upstream version. + * Fix -march logic in i386 building. Targets: #855088 + * Fix watch file to point to new upstream on github. Closes: #866678 + + [ Nico Schlömer ] + * Correct homepage and add Vcs tags in debian/control. + + -- Steve Capper Sun, 23 Jul 2017 12:55:42 +0100 + +tbb (2017~U7-1~exp1) experimental; urgency=medium + + * Upgrade to latest upstream version of TBB. + + This now builds with gcc 7. Targets: #853679 + + This supports s390x. Targets: #809663 + * Update copyright file to Apache 2.0 to match new upstream version. + * Fix -march logic in i386 building. Targets: #855088 + * Fix watch file to point to new upstream on github. Targets: #866678 + + -- Steve Capper Sat, 08 Jul 2017 10:45:31 +0100 + +tbb (4.3~20150611-2) unstable; urgency=medium + + * Add support for armel by distinguishing from armhf. + * Fold in unit test timeout logic in to tally patch. + + -- Steve Capper Fri, 03 Jun 2016 20:30:33 +0100 + +tbb (4.3~20150611-1) unstable; urgency=medium + + * Dump out /proc/cpuinfo and gcc preprocessor directives on build to + help debug issues. + * Timeout of 10 minutes set on unit tests. Any tests that timeout are + logged. + + [Mathieu Malaterre ] + * Tweak 64 bits detection. + + -- Steve Capper Mon, 30 May 2016 17:01:44 +0100 + +tbb (4.3~20150611-0.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Matthias Klose ] + * Upload version from experimental to sid, fixing build with GCC 5. + Closes: #778139. + * The architecture list is now marked as linux-any. Closes: #748876. + * Multiarchify the packages (Marc Glisse). Closes: #751689. + * The new upstream fixes the check for __TBB_CPP11_TYPE_PROPERTIES_PRESENT. + Closes: #779553. + + [ Adam Conrad ] + * gcc-atomic-detection.patch: Fix the gcc atomic detection to work for + gcc-5.x and up, as well as adding -latomic to LIBS (closes: #787084) + * gcc-atomic-always.patch: Always define TBB_USE_GCC_BUILTINS for GCC. + * debian/tbb.pc.in: Add -latomic to the pkg-config file for the above. + + -- Matthias Klose Sat, 05 Sep 2015 19:06:39 +0200 + +tbb (4.3~20150611-1~exp3) experimental; urgency=medium + + * Put Mathieu's ppc32 gcc atomic disable patch back in (it shouldn't + have been removed). + * Switch target architecture to linux-any. + * Go full atomic, move all __sync to __atomic. + + -- Steve Capper Fri, 03 Jul 2015 20:20:34 +0100 + +tbb (4.3~20150611-1~exp2) experimental; urgency=medium + + * Replace __sync_val_compare_and_swap with __atomic_compare_exchange_n for + gcc_generic.h + - Original patch by Mathieu Malaterre, some logic has been tweaked. + + -- Steve Capper Thu, 02 Jul 2015 19:32:04 +0100 + +tbb (4.3~20150611-1~exp1) experimental; urgency=medium + + * New upstream release. + + Mainly C++11 features/fixes. + + -- Steve Capper Sat, 20 Jun 2015 16:31:03 +0100 + +tbb (4.2~20140122-6) experimental; urgency=medium + + * First stab at an experimental upload. + * No substantive changes from -5. + + -- Steve Capper Mon, 27 Apr 2015 21:37:32 +0100 + +tbb (4.2~20140122-5) unstable; urgency=medium + + * Locked down build architectures to: + amd64, arm64, armhf, hppa, i386, powerpc and ppc64el + + -- Steve Capper Thu, 22 Jan 2015 17:42:38 +0000 + +tbb (4.2~20140122-4) unstable; urgency=medium + * Bump standards version to 3.9.6. + * Add debian/tbb.pc to clean list. + + [ Mathieu Malaterre ] + * Don't use gcc atomics for ppc32. Closes: #762656 + + -- Steve Capper Thu, 30 Oct 2014 17:55:02 +0000 + +tbb (4.2~20140122-3) unstable; urgency=medium + + * Unit test execution failures no longer cause build to fail; instead take a + tally of passes/failures to make it easier to analyse which cases are prone + to failure. + + debian/patches/tally-unit-test-fails.patch + * debian/rules modified s.t. the unit tests are no longer executed twice + + -- Steve Capper Fri, 19 Sep 2014 20:35:24 +0100 + +tbb (4.2~20140122-2) unstable; urgency=medium + + * Unit test compile errors no longer ignored. Closes: #752820 + * for i386 architecture, set march=i586 (has to match gcc): Closes: #756233 + * Debian architecture overrides uname -m, allows pbuilder i386 builds. + * Amended Linux kernel version detection logic to work with x.y. + * Bump standards version to 3.9.5. + * A couple of Lintian source-is-missing errors overridden. + + -- Steve Capper Sat, 26 Jul 2014 18:45:08 +0100 + +tbb (4.2~20140122-1.1) unstable; urgency=low + + [ Helge Deller ] + * Enable builds for hppa. Closes: #748876 + + [ Wookey ] + * Enable builds for arm64. Closes: #748508 + + [ Mathieu Malaterre ] + * Non-maintainer upload. + * Prefer `Arch: any` now that tbb build on most arch now + + -- Mathieu Malaterre Wed, 04 Jun 2014 15:08:28 +0200 + +tbb (4.2~20140122-1) unstable; urgency=medium + + * Added myself as maintainer for package. + * Added a symlink to tbb-examples so build instructions now work for them. + * Added a dependency to libjs-query and a symlink to remove the embedded + copy. + * New upstream release: + + armv7l build fixes, removed armhf.patch + + rebased adddebug.patch and fixnonlinux.patch + + -- Steve Capper Mon, 07 Apr 2014 14:51:05 +0100 + +tbb (4.2~20130725-2) unstable; urgency=low + + * Oprhan the package, set maintainer to Debian QA Group + + -- Roberto C. Sanchez Sun, 02 Mar 2014 13:05:59 -0500 + +tbb (4.2~20130725-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Add mips mipsel to the list of supported arches in debian/control + Closes: #739965 + + -- Anibal Monsalve Salazar Mon, 24 Feb 2014 12:27:06 +0000 + +tbb (4.2~20130725-1.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream + * Fix buildds: x32/sparc/sparc64 + * Do not compress Makefiles in tbb-examples + + -- Mathieu Malaterre Tue, 08 Oct 2013 08:23:25 +0000 + +tbb (4.1~20130613-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix armhf buildd + + debian/patches/armhf.patch + * Fix hardening flags (missing CPPFLAGS) + * Fix d/watch file + + -- Mathieu Malaterre Wed, 18 Sep 2013 09:22:27 +0200 + +tbb (4.1~20130613-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove patches from bug #692033, since integrated upstream now + * Upload to sid + - Closes: #714986, #715162, #713347, #715425, #705495 + + -- Mathieu Malaterre Mon, 26 Aug 2013 13:00:26 +0200 + +tbb (4.1~20130613-1.1~exp1) experimental; urgency=low + + * Non-maintainer upload. + * Upload 4.1, update 4 + * Import patches for armhf (from 4.0+r233+update5-0.2) + + -- Mathieu Malaterre Sat, 06 Jul 2013 15:01:19 +0200 + +tbb (4.1~20130516-1.1~exp1) experimental; urgency=low + + * Non-maintainer upload. + * Upload 4.1, update 3. Closes: #695683 + * Switch to dh/9. Get harderning compilation + * Add d/watch. Closes: #695683 + * Use d/rules to generate version. Closes: #712146 + * Build PowerPC/SPE. Closes: #695685 + * Use new d/rules. Bump Std-Vers: 3.9.4 + + -- Mathieu Malaterre Fri, 05 Jul 2013 09:06:21 +0200 + +tbb (4.0+r233+update5-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Add armhf to the list of supported arches in debian/control, now that + ARMv7 support is there. Not (yet) worth doing for armel. + + -- Steve McIntyre Mon, 24 Jun 2013 17:05:45 +0100 + +tbb (4.0+r233+update5-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Updated to upstream 4.0 Update 5 release. + + Added 64-bit PowerPC support + * Applied ARMv7-A support patches from linaro. (Closes: #692033) + + -- Andrew Lee (李健秋) Wed, 12 Jun 2013 13:57:09 +0800 + +tbb (4.0+r233-1) unstable; urgency=low + + * New upstream release + + Add 32-bit PowerPC support + * Update to Standards-Version 3.9.2 (no changes) + * Add note to package descriptions that Pentium4-compatible and higher is + supported for i386 architecture users (Closes: #642248) + * Do not run test suite when DEB_BUILD_OPTIONS=nocheck (Closes: #642251) + * Do not ignore 'make clean' errors (Closes: #642242) + + -- Roberto C. Sanchez Sat, 24 Sep 2011 17:16:45 -0400 + +tbb (3.0+r147-1) unstable; urgency=low + + * New upstream release + * debian/copyright: update years + * debian/control: Add ppc64 to the Architecture fields + + -- Roberto C. Sanchez Thu, 31 Mar 2011 15:02:52 -0400 + +tbb (3.0+r035-2) unstable; urgency=low + + * Make examples build properly (Closes: #608347) + + Ship common Makefile snippets from upstream + + Document that upstream's _debug library versions are not shipped + * Update to Standards-Version 3.9.1 (no changes) + + + -- Roberto C. Sanchez Fri, 31 Dec 2010 15:21:02 -0500 + +tbb (3.0+r035-1) unstable; urgency=low + + * New upstream release + * Update to Standards-Version 3.9.0 (no changes) + * Switch to dpkg-source 3.0 (quilt) format + + -- Roberto C. Sanchez Mon, 28 Jun 2010 19:29:45 -0400 + +tbb (3.0+r018-1) unstable; urgency=low + + * New upstream release (Closes: #581614) + + -- Roberto C. Sanchez Sat, 15 May 2010 07:58:17 -0400 + +tbb (2.2+r013-1) unstable; urgency=low + + * New upstream release + * debian/copyright: update years + * Update to Standards-Version 3.8.4 (no changes) + + -- Roberto C. Sanchez Sat, 20 Feb 2010 12:22:19 -0500 + +tbb (2.2+r012-1) unstable; urgency=low + + * New upstream release + * Update pkg-config metadata file + * Add ${misc:Depends} as recommended by lintian + + -- Roberto C. Sanchez Wed, 27 Jan 2010 09:50:16 -0500 + +tbb (2.2+r009-1) unstable; urgency=low + + * New upstream release + + -- Roberto C. Sanchez Sun, 18 Oct 2009 14:50:25 -0400 + +tbb (2.2+r004-1) unstable; urgency=low + + * New upstream release (Closes: #545702) + * Update to Standards-Version 3.8.3 (no changes) + + -- Roberto C. Sanchez Wed, 09 Sep 2009 17:22:22 -0400 + +tbb (2.1r017-1) unstable; urgency=low + + * New upstream release + * Change libtbb2-dbg to section debug for new archive layout + + -- Roberto C. Sanchez Sun, 10 May 2009 21:15:34 -0400 + +tbb (2.1r015-1) unstable; urgency=low + + * New upstream release + * 02_replace_arch_command.dpatch: merged upstream + * Remove build dependency on dpatch and modify debian-rules accordingly + * Add .pc file to help when building against the library + * Update to Standards-Version 3.8.1 (no changes) + + -- Roberto C. Sanchez Tue, 17 Mar 2009 15:52:47 -0400 + +tbb (2.1~20080605-1) unstable; urgency=low + + * New upstream release + * Drop patches + - 01_add_soname: suitable fascimile implemented upstream + - 03_ias_patch: upstream now using as instead of ias + * Update to Standards-Version 3.8.0 (no changes) + * Add new upstream Doxygen documentation (in libtbb-doc package) + * Register new documentation with doc-base + * debian/copyright: Update years of copyright + + -- Roberto C. Sanchez Tue, 08 Jul 2008 18:51:22 -0400 + +tbb (2.0r020-1) unstable; urgency=low + + * New upstream release. + * debian/patches/04_g++-4.3.dpatch: Removed, integrated upstream + + -- Roberto C. Sanchez Tue, 29 Apr 2008 15:31:09 -0400 + +tbb (2.0r017-1) unstable; urgency=low + + * New upstream release. + + -- Roberto C. Sanchez Sat, 08 Mar 2008 22:15:13 -0500 + +tbb (2.0r014-4) unstable; urgency=low + + * Make tbb-examples recommend libtbb-dev. + * Make libtbb-dev suggest tbb-examples. + * Patch to allow building with g++-4.3 (Closes: #462415) + * Only conditionally create symlink (Closes: #465617) + + -- Roberto C. Sanchez Thu, 14 Feb 2008 18:36:15 -0500 + +tbb (2.0r014-3) unstable; urgency=low + + * Fix short descriptions of tbb-examples (Closes: #457442) + * Fix short descriptions of libtbb2-dbg (Closes: #457443) + * Add patch to allow build to succeed on Itanium + + -- Roberto C. Sanchez Thu, 3 Jan 2008 15:21:50 -0500 + +tbb (2.0r014-2) unstable; urgency=low + + * debian/copyright: Fix license statement. + + -- Roberto C. Sanchez Wed, 19 Dec 2007 21:17:16 -0500 + +tbb (2.0r014-1) unstable; urgency=low + + * Initial release (Closes: #434583) + + -- Roberto C. Sanchez Fri, 14 Dec 2007 23:10:58 -0500 diff --git a/control b/control new file mode 100644 index 0000000..1ab3ae7 --- /dev/null +++ b/control @@ -0,0 +1,112 @@ +Source: onetbb +Maintainer: Debian Science Maintainers +Uploaders: Steve Capper , Mo Zhou +Section: libs +Priority: optional +Build-Depends: debhelper-compat (= 13), + cmake, + gdb, + libhwloc-dev, + libjs-jquery , + libjs-underscore , + ninja-build, + pkgconf, + python3-sphinx , + python3-sphinx-rtd-theme +Build-Depends-Indep: doxygen, graphviz +Standards-Version: 4.7.0 +Vcs-Browser: https://salsa.debian.org/science-team/tbb +Vcs-Git: https://salsa.debian.org/science-team/tbb.git +Homepage: https://uxlfoundation.github.io/oneTBB/ +Rules-Requires-Root: no + +Package: libtbb-dev +Architecture: linux-any +Multi-Arch: same +Section: libdevel +Depends: libtbb12 (= ${binary:Version}), ${misc:Depends} +Suggests: libtbb-doc +Description: parallelism library for C++ - development files + TBB is a library that helps you leverage multi-core processor + performance without having to be a threading expert. It represents a + higher-level, task-based parallelism that abstracts platform details + and threading mechanism for performance and scalability. + . + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel + or compatible hardware, this package only supports Pentium4-compatible + and higher processors.) + . + This package includes the TBB development files. + +Package: libtbb12 +Architecture: linux-any +Multi-Arch: same +Depends: libtbbbind-2-5 (= ${binary:Version}), + libtbbmalloc2 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Breaks: libtbb2 (<< 2021) +Description: parallelism library for C++ - runtime files + TBB is a library that helps you leverage multi-core processor + performance without having to be a threading expert. It represents a + higher-level, task-based parallelism that abstracts platform details + and threading mechanism for performance and scalability. + . + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel + or compatible hardware, this package only supports Pentium4-compatible + and higher processors.) + . + This package includes the TBB runtime files. + +Package: libtbbmalloc2 +Architecture: linux-any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Breaks: libtbb12 (<< 2021.5-7ubuntu2), libtbb2 (<< 2020.3-1ubuntu2) +Replaces: libtbb12 (<< 2021.5-7ubuntu2), libtbb2 (<< 2020.3-1ubuntu2) +Description: parallelism helper library for C++ - runtime files + TBB is a library that helps you leverage multi-core processor + performance without having to be a threading expert. It represents a + higher-level, task-based parallelism that abstracts platform details + and threading mechanism for performance and scalability. + . + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel + or compatible hardware, this package only supports Pentium4-compatible + and higher processors.) + . + This package includes the TBB runtime files. + +Package: libtbbbind-2-5 +Architecture: linux-any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} +Description: parallelism library for C++ - runtime files + TBB is a library that helps you leverage multi-core processor + performance without having to be a threading expert. It represents a + higher-level, task-based parallelism that abstracts platform details + and threading mechanism for performance and scalability. + . + (Note: if you are a user of the i386 architecture, i.e., 32-bit Intel + or compatible hardware, this package only supports Pentium4-compatible + and higher processors.) + . + This package includes the TBB runtime files. + +Package: libtbb-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Breaks: tbb-examples (<< 2020.0-2) +Replaces: tbb-examples (<< 2020.0-2) +Depends: libjs-jquery, ${misc:Depends} +Recommends: libtbb-dev +Description: parallelism library for C++ - documentation + TBB is a library that helps you leverage multi-core processor + performance without having to be a threading expert. It represents a + higher-level, task-based parallelism that abstracts platform details + and threading mechanism for performance and scalability. + . + This package includes the TBB documentation files and examples. diff --git a/copyright b/copyright new file mode 100644 index 0000000..d696273 --- /dev/null +++ b/copyright @@ -0,0 +1,137 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: oneTBB +Source: https://github.com/oneapi-src/oneTBB + +Files: * +Copyright: 2005-2021 Intel Corporation +License: Apache-2.0 + +Files: python/tbb/test.py + python/tbb/pool.py +Copyright: 2008,2016 David Decotigny (Pool of threads) + 2006-2008, R Oudkerk (multiprocessing.Pool) +License: BSD-3-Clause + +Files: examples/graph/fgbzip2/* +Copyright: 1996-2010 Julian R. Seward +License: BSD-like-bzip2 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. The origin of this software must not be misrepresented; you must + not claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product + documentation would be appreciated but is not required. + . + 3. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + . + 4. The name of the author may not be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: examples/parallel_for/tachyon/src/* +Copyright: 1994-2008 John E. Stone +License: BSD-3-Clause + +Files: test/common/doctest.h +Copyright: 2016-2021 Viktor Kirilov +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Files: examples/parallel_for/seismic/gui/seismic.rc +Copyright: 2005-2008 IDC_STATIC (SeismicSimulation Version 1.1) +License: GPL-1+ + The complete text of the GNU General Public License can be fodun on Debian + systems at `/usr/share/common-licenses/GPL-1'. +Comment: License statement obtained from + https://geodynamics.org/cig/software/sw4/ + +Files: src/tbbmalloc_proxy/proxy_overload_osx.h +Copyright: 2011, Google Inc +License: BSD-3-Clause + +Files: debian/* +Copyright: 2007-2011, Athena Capital Research + 2007-2014 Roberto C. Sanchez + 2014-2017 Steve Capper + 2018-2022 Mo Zhou +License: GPL-2 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache 2.0 License can be found at + `/usr/share/common-licenses/Apache-2.0'. + +License: GPL-2 + The complete text of the GNU General Public License can be fodun on Debian + systems at `/usr/share/common-licenses/GPL-2'. + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of author nor the names of any contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff --git a/libtbb-dev.README.Debian b/libtbb-dev.README.Debian new file mode 100644 index 0000000..45411c2 --- /dev/null +++ b/libtbb-dev.README.Debian @@ -0,0 +1,22 @@ +tbb for Debian +-------------- + +This is the Intel Threading Building Blocks package. It comes from the +"Commercial Aligned Release" series of TBB releases. + +This package ships a pkg-config file in /usr/lib/pkgconfig/tbb.pc. Here is +an example of how it is used: + +gcc -o test test.c `pkg-config --libs --cflags tbb` + +The examples are located in the tbb-examples package. In order to install +and use them, you want to install that package and run something like this: + +cd ~ +cp -r /usr/share/doc/tbb-examples/ . +cd tbb-examples +find . -name '*.gz'| xargs gunzip +cd examples +make + + -- Roberto C. Sanchez Fri, 14 Dec 2007 23:10:58 -0500 diff --git a/libtbb-dev.install b/libtbb-dev.install new file mode 100644 index 0000000..36fe508 --- /dev/null +++ b/libtbb-dev.install @@ -0,0 +1,5 @@ +usr/include/oneapi +usr/include/tbb +usr/lib/*/cmake +usr/lib/*/lib*.so +usr/lib/*/pkgconfig diff --git a/libtbb-doc.README.Debian b/libtbb-doc.README.Debian new file mode 100644 index 0000000..884abed --- /dev/null +++ b/libtbb-doc.README.Debian @@ -0,0 +1,28 @@ +tbb for Debian +-------------- + +This is the Intel Threading Building Blocks package. It comes from the +"Commercial Aligned Release" series of TBB releases. + +This package ships a pkg-config file in /usr/lib/*/pkgconfig/tbb.pc. Here is +an example of how it is used: + +gcc -o test test.c `pkg-config --libs --cflags tbb` + +The examples are located in the tbb-examples package. In order to install +and use them, you want to install that package and run something like this: + +cd ~ +cp -r /usr/share/doc/tbb-examples/ . +cd tbb-examples +find . -name '*.gz'| xargs gunzip +cd examples +make + +Please note that the Debian tbb package does not ship the various *_debug* +libraries that are built as part of the upstream build process. There a +numerous reasons for this. If you need debugging symbols, then please install +the -dbg package. If you require some of the specific functionality of the +those other libraries, than that is unfortunately not available at this time. + + -- Roberto C. Sanchez Fri, 31 Dec 2010 17:13:49 -0500 diff --git a/libtbb-doc.doc-base b/libtbb-doc.doc-base new file mode 100644 index 0000000..3be9b6a --- /dev/null +++ b/libtbb-doc.doc-base @@ -0,0 +1,10 @@ +Document: libtbb-doc +Title: Threading Building Blocks Library Documentation +Author: Intel Corporation +Abstract: Documentation for developing against libtbb +Section: Programming + +Format: HTML +Index: /usr/share/doc/libtbb-dev/html/index.html +Files: /usr/share/doc/libtbb-dev/html/*.html + diff --git a/libtbb-doc.docs b/libtbb-doc.docs new file mode 100644 index 0000000..e8edb09 --- /dev/null +++ b/libtbb-doc.docs @@ -0,0 +1,2 @@ +README.md +html/ diff --git a/libtbb-doc.examples b/libtbb-doc.examples new file mode 100644 index 0000000..e39721e --- /dev/null +++ b/libtbb-doc.examples @@ -0,0 +1 @@ +examples/* diff --git a/libtbb-doc.links b/libtbb-doc.links new file mode 100644 index 0000000..729a632 --- /dev/null +++ b/libtbb-doc.links @@ -0,0 +1,3 @@ +/usr/share/javascript/jquery/jquery.js /usr/share/doc/libtbb-dev/html/_static/jquery.js +/usr/share/javascript/underscore/underscore.js /usr/share/doc/libtbb-dev/html/_static/underscore.js +usr/share/doc/libtbb-dev/examples usr/share/doc/libtbb-dev/build diff --git a/libtbb12.install b/libtbb12.install new file mode 100644 index 0000000..ea69804 --- /dev/null +++ b/libtbb12.install @@ -0,0 +1 @@ +usr/lib/*/libtbb.so.* diff --git a/libtbb12.symbols.amd64 b/libtbb12.symbols.amd64 new file mode 100644 index 0000000..f610c41 --- /dev/null +++ b/libtbb12.symbols.amd64 @@ -0,0 +1,102 @@ +libtbb.so.12 libtbb12 #MINVER# + TBB_runtime_interface_version@Base 2021.4.0 + TBB_runtime_version@Base 2021.4.0 + _ZN3tbb6detail2r110deallocateERNS0_2d117small_object_poolEPvm@Base 2021.4.0 + _ZN3tbb6detail2r110deallocateERNS0_2d117small_object_poolEPvmRKNS2_14execution_dataE@Base 2021.4.0 + _ZN3tbb6detail2r110initializeERNS0_2d115task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r110initializeERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r111try_acquireERNS0_2d116queuing_rw_mutexERNS3_11scoped_lockEb@Base 2021.4.0 + _ZN3tbb6detail2r111try_acquireERNS0_2d19rtm_mutexERNS3_11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r112itt_task_endENS0_2d115itt_domain_enumE@Base 2021.4.0 + _ZN3tbb6detail2r114acquire_readerERNS0_2d112rtm_rw_mutexERNS3_11scoped_lockEb@Base 2021.4.0 + _ZN3tbb6detail2r114acquire_writerERNS0_2d112rtm_rw_mutexERNS3_11scoped_lockEb@Base 2021.4.0 + _ZN3tbb6detail2r114execution_slotEPKNS0_2d114execution_dataE@Base 2021.4.0 + _ZN3tbb6detail2r114execution_slotERKNS0_2d115task_arena_baseE@Base 2022.0.0 + _ZN3tbb6detail2r114itt_region_endENS0_2d115itt_domain_enumEPvy@Base 2021.4.0 + _ZN3tbb6detail2r114itt_task_beginENS0_2d115itt_domain_enumEPvyS4_yNS0_2d021string_resource_indexE@Base 2021.4.0 + _ZN3tbb6detail2r114notify_waitersEm@Base 2021.4.0 + _ZN3tbb6detail2r115allocate_memoryEm@Base 2021.4.0 + _ZN3tbb6detail2r115cache_line_sizeEv@Base 2021.4.0 + _ZN3tbb6detail2r115call_itt_notifyEiPv@Base 2021.4.0 + _ZN3tbb6detail2r115core_type_countEl@Base 2021.4.0 + _ZN3tbb6detail2r115create_itt_syncEPvPKcS4_@Base 2021.4.0 + _ZN3tbb6detail2r115current_contextEv@Base 2021.4.0 + _ZN3tbb6detail2r115max_concurrencyEPKNS0_2d115task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r115numa_node_countEv@Base 2021.4.0 + _ZN3tbb6detail2r115throw_exceptionENS0_2d012exception_idE@Base 2021.4.0 + _ZN3tbb6detail2r115wait_on_addressEPvRNS0_2d113delegate_baseEm@Base 2021.4.0 + _ZN3tbb6detail2r116execute_and_waitERNS0_2d14taskERNS2_18task_group_contextERNS2_12wait_contextES6_@Base 2021.4.0 + _ZN3tbb6detail2r116itt_region_beginENS0_2d115itt_domain_enumEPvyS4_yNS0_2d021string_resource_indexE@Base 2021.4.0 + _ZN3tbb6detail2r116itt_relation_addENS0_2d115itt_domain_enumEPvyNS0_2d012itt_relationES4_y@Base 2021.4.0 + _ZN3tbb6detail2r116set_end_of_inputERNS0_2d111base_filterE@Base 2021.4.0 + _ZN3tbb6detail2r117assertion_failureEPKciS3_S3_@Base 2021.4.0 + _ZN3tbb6detail2r117deallocate_memoryEPv@Base 2021.4.0 + _ZN3tbb6detail2r117fill_numa_indicesEPi@Base 2021.4.0 + _ZN3tbb6detail2r117is_tbbmalloc_usedEv@Base 2021.4.0 + _ZN3tbb6detail2r117itt_set_sync_nameEPvPKc@Base 2021.4.0 + _ZN3tbb6detail2r117notify_by_addressEPvm@Base 2021.4.0 + _ZN3tbb6detail2r117parallel_pipelineERNS0_2d118task_group_contextEmRKNS2_11filter_nodeE@Base 2021.4.0 + _ZN3tbb6detail2r117upgrade_to_writerERNS0_2d116queuing_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r118try_acquire_readerERNS0_2d112rtm_rw_mutexERNS3_11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r118try_acquire_writerERNS0_2d112rtm_rw_mutexERNS3_11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r119capture_fp_settingsERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r119downgrade_to_readerERNS0_2d116queuing_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r119itt_make_task_groupENS0_2d115itt_domain_enumEPvyS4_yNS0_2d021string_resource_indexE@Base 2021.4.0 + _ZN3tbb6detail2r120isolate_within_arenaERNS0_2d113delegate_baseEl@Base 2021.4.0 + _ZN3tbb6detail2r120itt_metadata_ptr_addENS0_2d115itt_domain_enumEPvyNS0_2d021string_resource_indexES4_@Base 2021.4.0 + _ZN3tbb6detail2r120itt_metadata_str_addENS0_2d115itt_domain_enumEPvyNS0_2d021string_resource_indexEPKc@Base 2021.4.0 + _ZN3tbb6detail2r121current_suspend_pointEv@Base 2021.4.0 + _ZN3tbb6detail2r121notify_by_address_allEPv@Base 2021.4.0 + _ZN3tbb6detail2r121notify_by_address_oneEPv@Base 2021.4.0 + _ZN3tbb6detail2r122cache_aligned_allocateEm@Base 2021.4.0 + _ZN3tbb6detail2r122cancel_group_executionERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r122fill_core_type_indicesEPil@Base 2021.4.0 + _ZN3tbb6detail2r124cache_aligned_deallocateEPv@Base 2021.4.0 + _ZN3tbb6detail2r124numa_default_concurrencyEi@Base 2021.4.0 + _ZN3tbb6detail2r126allocate_bounded_queue_repEm@Base 2021.4.0 + _ZN3tbb6detail2r126wait_bounded_queue_monitorEPNS1_18concurrent_monitorEmlRNS0_2d113delegate_baseE@Base 2021.4.0 + _ZN3tbb6detail2r127get_thread_reference_vertexEPNS0_2d126wait_tree_vertex_interfaceE@Base 2022.0.0 + _ZN3tbb6detail2r127global_control_active_valueEi@Base 2021.4.0 + _ZN3tbb6detail2r128abort_bounded_queue_monitorsEPNS1_18concurrent_monitorE@Base 2021.4.0 + _ZN3tbb6detail2r128constraints_threads_per_coreERKNS0_2d111constraintsEl@Base 2021.4.0 + _ZN3tbb6detail2r128deallocate_bounded_queue_repEPhm@Base 2021.4.0 + _ZN3tbb6detail2r128is_group_execution_cancelledERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r128notify_bounded_queue_monitorEPNS1_18concurrent_monitorEmm@Base 2021.4.0 + _ZN3tbb6detail2r131constraints_default_concurrencyERKNS0_2d111constraintsEl@Base 2021.4.0 + _ZN3tbb6detail2r13getERNS0_2d121task_scheduler_handleE@Base 2021.4.0 + _ZN3tbb6detail2r14waitERNS0_2d112wait_contextERNS2_18task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r14waitERNS0_2d115task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r15resetERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r15spawnERNS0_2d14taskERNS2_18task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r15spawnERNS0_2d14taskERNS2_18task_group_contextEt@Base 2021.4.0 + _ZN3tbb6detail2r16attachERNS0_2d115task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r16createERNS0_2d114global_controlE@Base 2021.4.0 + _ZN3tbb6detail2r16resumeEPNS1_18suspend_point_typeE@Base 2021.4.0 + _ZN3tbb6detail2r16submitERNS0_2d14taskERNS2_18task_group_contextEPNS1_5arenaEm@Base 2021.4.0 + _ZN3tbb6detail2r17acquireERNS0_2d116queuing_rw_mutexERNS3_11scoped_lockEb@Base 2021.4.0 + _ZN3tbb6detail2r17acquireERNS0_2d19rtm_mutexERNS3_11scoped_lockEb@Base 2021.4.0 + _ZN3tbb6detail2r17destroyERNS0_2d114global_controlE@Base 2021.4.0 + _ZN3tbb6detail2r17destroyERNS0_2d118task_group_contextE@Base 2021.4.0 + _ZN3tbb6detail2r17enqueueERNS0_2d14taskEPNS2_15task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r17enqueueERNS0_2d14taskERNS2_18task_group_contextEPNS2_15task_arena_baseE@Base 2021.4.0 + _ZN3tbb6detail2r17executeERNS0_2d115task_arena_baseERNS2_13delegate_baseE@Base 2021.4.0 + _ZN3tbb6detail2r17observeERNS0_2d123task_scheduler_observerEb@Base 2021.4.0 + _ZN3tbb6detail2r17releaseERNS0_2d112rtm_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r17releaseERNS0_2d116queuing_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r17releaseERNS0_2d19rtm_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r17suspendEPFvPvPNS1_18suspend_point_typeEES2_@Base 2021.4.0 + _ZN3tbb6detail2r17upgradeERNS0_2d112rtm_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r18allocateERPNS0_2d117small_object_poolEm@Base 2021.4.0 + _ZN3tbb6detail2r18allocateERPNS0_2d117small_object_poolEmRKNS2_14execution_dataE@Base 2021.4.0 + _ZN3tbb6detail2r18finalizeERNS0_2d121task_scheduler_handleEl@Base 2021.4.0 + _ZN3tbb6detail2r19constructERNS0_2d116queuing_rw_mutexE@Base 2021.4.0 + _ZN3tbb6detail2r19downgradeERNS0_2d112rtm_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r19is_writerERKNS0_2d116queuing_rw_mutex11scoped_lockE@Base 2021.4.0 + _ZN3tbb6detail2r19terminateERNS0_2d115task_arena_baseE@Base 2021.4.0 + _ZTIN3tbb6detail2r110user_abortE@Base 2021.4.0 + _ZTIN3tbb6detail2r111unsafe_waitE@Base 2021.4.0 + _ZTIN3tbb6detail2r112missing_waitE@Base 2021.4.0 + _ZTIN3tbb6detail2r114bad_last_allocE@Base 2021.4.0 + _ZTVN3tbb6detail2r110user_abortE@Base 2021.4.0 + _ZTVN3tbb6detail2r112missing_waitE@Base 2021.4.0 + _ZTVN3tbb6detail2r114bad_last_allocE@Base 2021.4.0 diff --git a/libtbbbind-2-5.install b/libtbbbind-2-5.install new file mode 100644 index 0000000..40e7866 --- /dev/null +++ b/libtbbbind-2-5.install @@ -0,0 +1 @@ +usr/lib/*/libtbbbind_*.so.* diff --git a/libtbbbind-2-5.lintian-overrides b/libtbbbind-2-5.lintian-overrides new file mode 100644 index 0000000..730fa90 --- /dev/null +++ b/libtbbbind-2-5.lintian-overrides @@ -0,0 +1 @@ +libtbbbind-2-5: package-name-doesnt-match-sonames libtbbbind-2-5-3 diff --git a/libtbbmalloc2.install b/libtbbmalloc2.install new file mode 100644 index 0000000..b4995fe --- /dev/null +++ b/libtbbmalloc2.install @@ -0,0 +1 @@ +usr/lib/*/libtbbmalloc*.so.* diff --git a/libtbbmalloc2.symbols.amd64 b/libtbbmalloc2.symbols.amd64 new file mode 100644 index 0000000..e57e433 --- /dev/null +++ b/libtbbmalloc2.symbols.amd64 @@ -0,0 +1,62 @@ +libtbbmalloc.so.2 libtbbmalloc2 #MINVER# + MallocInitializeITT@Base 2017~U7 + (optional)_Z9parseFileILi100ELi1EEvPKcRAT0__K13parseFileItem@Base 2018~U6 + (optional)_Z9parseFileILi100ELi2EEvPKcRAT0__K13parseFileItem@Base 2018~U6 + (optional)_ZN11MallocMutex11scoped_lockD1Ev@Base 2020.3 + (optional)_ZN11MallocMutex11scoped_lockD2Ev@Base 2020.3 + _ZN3rml10pool_msizeEPNS_10MemoryPoolEPv@Base 2019~U4 + _ZN3rml10pool_resetEPNS_10MemoryPoolE@Base 2017~U7 + _ZN3rml11pool_createElPKNS_13MemPoolPolicyE@Base 2017~U7 + _ZN3rml11pool_mallocEPNS_10MemoryPoolEm@Base 2017~U7 + _ZN3rml12pool_destroyEPNS_10MemoryPoolE@Base 2017~U7 + _ZN3rml12pool_reallocEPNS_10MemoryPoolEPvm@Base 2017~U7 + _ZN3rml13pool_identifyEPv@Base 2017~U7 + _ZN3rml14pool_create_v1ElPKNS_13MemPoolPolicyEPPNS_10MemoryPoolE@Base 2017~U7 + _ZN3rml19pool_aligned_mallocEPNS_10MemoryPoolEmm@Base 2017~U7 + _ZN3rml20pool_aligned_reallocEPNS_10MemoryPoolEPvmm@Base 2017~U7 + _ZN3rml9pool_freeEPNS_10MemoryPoolEPv@Base 2017~U7 + __TBB_malloc_safer_aligned_msize@Base 2017~U7 + __TBB_malloc_safer_aligned_realloc@Base 2017~U7 + __TBB_malloc_safer_free@Base 2017~U7 + __TBB_malloc_safer_msize@Base 2017~U7 + __TBB_malloc_safer_realloc@Base 2017~U7 + scalable_aligned_free@Base 2017~U7 + scalable_aligned_malloc@Base 2017~U7 + scalable_aligned_realloc@Base 2017~U7 + scalable_allocation_command@Base 2017~U7 + scalable_allocation_mode@Base 2017~U7 + scalable_calloc@Base 2017~U7 + scalable_free@Base 2017~U7 + scalable_malloc@Base 2017~U7 + scalable_msize@Base 2017~U7 + scalable_posix_memalign@Base 2017~U7 + scalable_realloc@Base 2017~U7 +libtbbmalloc_proxy.so.2 libtbbmalloc2 #MINVER# + _ZdaPv@Base 2017~U7 + _ZdaPvRKSt9nothrow_t@Base 2017~U7 + _ZdlPv@Base 2017~U7 + _ZdlPvRKSt9nothrow_t@Base 2017~U7 + _Znam@Base 2017~U7 + _ZnamRKSt9nothrow_t@Base 2017~U7 + _Znwm@Base 2017~U7 + _ZnwmRKSt9nothrow_t@Base 2017~U7 + __TBB_malloc_proxy@Base 2017~U7 + __libc_calloc@Base 2017~U7 + __libc_free@Base 2017~U7 + __libc_malloc@Base 2017~U7 + __libc_memalign@Base 2017~U7 + __libc_pvalloc@Base 2017~U7 + __libc_realloc@Base 2017~U7 + __libc_valloc@Base 2017~U7 + aligned_alloc@Base 2017~U7 + calloc@Base 2017~U7 + free@Base 2017~U7 + mallinfo@Base 2017~U7 + malloc@Base 2017~U7 + malloc_usable_size@Base 2017~U7 + mallopt@Base 2017~U7 + memalign@Base 2017~U7 + posix_memalign@Base 2017~U7 + pvalloc@Base 2017~U7 + realloc@Base 2017~U7 + valloc@Base 2017~U7 diff --git a/not-installed b/not-installed new file mode 100644 index 0000000..b56b176 --- /dev/null +++ b/not-installed @@ -0,0 +1 @@ +usr/share/doc/TBB/README.md diff --git a/patches/1000-remove-unaligned-test.patch b/patches/1000-remove-unaligned-test.patch new file mode 100644 index 0000000..a63e8da --- /dev/null +++ b/patches/1000-remove-unaligned-test.patch @@ -0,0 +1,25 @@ +Description: Remove unaligned mem-accesses from test_malloc_pools.cpp + This should help sparc64 tests, if we miss a case a SIGBUS + will greet us. +Author: Steve Capper +Last-Changed: 2017-08-13 +Forwarded: no + +Index: onetbb/test/tbbmalloc/test_malloc_pools.cpp +=================================================================== +--- onetbb.orig/test/tbbmalloc/test_malloc_pools.cpp ++++ onetbb/test/tbbmalloc/test_malloc_pools.cpp +@@ -66,11 +66,11 @@ static std::atomic liveRegions; + + static void *getMallocMem(intptr_t /*pool_id*/, size_t &bytes) + { +- void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader)+1); ++ void *rawPtr = malloc(bytes+sizeof(MallocPoolHeader)); + if (!rawPtr) + return nullptr; + // +1 to check working with unaligned space +- void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader)+1); ++ void *ret = (void *)((uintptr_t)rawPtr+sizeof(MallocPoolHeader)); + + MallocPoolHeader *hdr = (MallocPoolHeader*)ret-1; + hdr->rawPtr = rawPtr; diff --git a/patches/1010-test-less-stress.patch b/patches/1010-test-less-stress.patch new file mode 100644 index 0000000..4e33eb2 --- /dev/null +++ b/patches/1010-test-less-stress.patch @@ -0,0 +1,29 @@ +Description: Reduce stress of test_collaborative_call_once on __arm__. +Author: Mo Zhou +Last-Update: 2022-02-15 +Forwarded: https://github.com/oneapi-src/oneTBB/pull/789 + +Index: onetbb/test/tbb/test_collaborative_call_once.cpp +=================================================================== +--- onetbb.orig/test/tbb/test_collaborative_call_once.cpp ++++ onetbb/test/tbb/test_collaborative_call_once.cpp +@@ -217,6 +217,9 @@ TEST_CASE("only calls once - stress test + // that makes impossible to create more than ~500 threads. + // Android has been added to decrease testing time. + constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2; ++#elif defined(__ILP32__) && defined(__x86_64__) ++ // This is for x32 port https://wiki.debian.org/X32Port ++ constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2; + #elif __TBB_USE_THREAD_SANITIZER + // Reduce execution time under Thread Sanitizer + constexpr std::size_t N = tbb::detail::d0::max_nfs_size + 64; +@@ -291,6 +294,9 @@ TEST_CASE("handles exceptions - stress t + // that makes impossible to create more than ~500 threads. + // Android has been added to decrease testing time. + constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2; ++#elif defined(__ILP32__) && defined(__x86_64__) ++ // This is for x32 port https://wiki.debian.org/X32Port ++ constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 2; + #else + constexpr std::size_t N = tbb::detail::d0::max_nfs_size * 4; + #endif diff --git a/patches/1020-arch-generic.patch b/patches/1020-arch-generic.patch new file mode 100644 index 0000000..9a714dc --- /dev/null +++ b/patches/1020-arch-generic.patch @@ -0,0 +1,31 @@ +Description: This patch provides the generic architecture fallback, which was + not merged by upstream. We just keep the patch here. +Author: Matthias Klose +Last-Update: 2023-06-17 +Bug-Debian: https://bugs.debian.org/1006920 +Forwarded: https://github.com/oneapi-src/oneTBB/issues/776 + +Index: onetbb/src/tbb/tools_api/ittnotify_config.h +=================================================================== +--- onetbb.orig/src/tbb/tools_api/ittnotify_config.h ++++ onetbb/src/tbb/tools_api/ittnotify_config.h +@@ -196,6 +196,10 @@ + # define ITT_ARCH_RISCV64 10 + #endif /* ITT_ARCH_RISCV64 */ + ++#ifndef ITT_ARCH_GENERIC ++# define ITT_ARCH_GENERIC 99 ++#endif /* ITT_ARCH_GENERIC */ ++ + #ifndef ITT_ARCH + # if defined _M_IX86 || defined __i386__ + # define ITT_ARCH ITT_ARCH_IA32 +@@ -217,6 +221,8 @@ + # define ITT_ARCH ITT_ARCH_HPPA + # elif defined __riscv && __riscv_xlen == 64 + # define ITT_ARCH ITT_ARCH_RISCV64 ++# else ++# define ITT_ARCH ITT_ARCH_GENERIC + # endif + + #endif diff --git a/patches/1030-warning-flags.patch b/patches/1030-warning-flags.patch new file mode 100644 index 0000000..fec1132 --- /dev/null +++ b/patches/1030-warning-flags.patch @@ -0,0 +1,18 @@ +Description: Suppress compiler warnings since GCC-12. (Closes: #1016283) +Author: Mo Zhou +Last-Update: 2022-08-18 +Forwarded: https://github.com/oneapi-src/oneTBB/issues/823 + +Index: onetbb/cmake/compilers/GNU.cmake +=================================================================== +--- onetbb.orig/cmake/compilers/GNU.cmake ++++ onetbb/cmake/compilers/GNU.cmake +@@ -26,7 +26,7 @@ else() + set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH}) + endif() + +-set(TBB_WARNING_LEVEL -Wall -Wextra $<$:-Werror> -Wfatal-errors) ++set(TBB_WARNING_LEVEL -Wall -Wextra $<$:-Werror> -Wfatal-errors -Wno-error=uninitialized -Wno-error=array-bounds -Wno-error=use-after-free -Wno-error=address) + set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor) + + # Depfile options (e.g. -MD) are inserted automatically in some cases. diff --git a/patches/1050-armel-atomic-past-buffer.patch b/patches/1050-armel-atomic-past-buffer.patch new file mode 100644 index 0000000..5c694b8 --- /dev/null +++ b/patches/1050-armel-atomic-past-buffer.patch @@ -0,0 +1,44 @@ +Description: Avoid build problem on armel caused by strange compiler. + Add indirection and a result test which seem to confuse GCC 13 less + than the original statements. + + Fixes build problem: + In file included from /usr/include/c++/13/atomic:41, + from /<>/test/common/doctest.h:2990, + from /<>/test/common/test.h:32, + from /<>/test/tbb/test_concurrent_monitor.cpp:26: + In member function ‘void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]’, + inlined from ‘void std::atomic::store(bool, std::memory_order)’ at /usr/include/c++/13/atomic:104:20, + inlined from ‘void tbb::detail::r1::concurrent_monitor_base::notify_one_relaxed() [with Context = unsigned int]’ at /<>/test/tbb/../../src/tbb/concurrent_monitor.h:293:53, + inlined from ‘void tbb::detail::r1::concurrent_monitor_base::notify_one() [with Context = unsigned int]’ at /<>/test/tbb/../../src/tbb/concurrent_monitor.h:276:27, + inlined from ‘void DOCTEST_ANON_FUNC_35()’ at /<>/test/tbb/test_concurrent_monitor.cpp:87:44: + /usr/include/c++/13/bits/atomic_base.h:481:25: error: ‘void __atomic_store_1(volatile void*, unsigned char, int)’ writing 1 byte into a region of size 0 overflows the destination [-Werror=stringop-overflow=] + 481 | __atomic_store_n(&_M_i, __i, int(__m)); + | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ + +Author: Petter Reinholdtsen +Forwarded: no +Bug-Debian: https://bugs.debian.org/1042009 +Last-Update: 2023-07-31 + +Index: onetbb/src/tbb/concurrent_monitor.h +=================================================================== +--- onetbb.orig/src/tbb/concurrent_monitor.h ++++ onetbb/src/tbb/concurrent_monitor.h +@@ -290,7 +290,15 @@ public: + n = my_waitset.front(); + if (n != end) { + my_waitset.remove(*n); +- to_wait_node(n)->my_is_in_list.store(false, std::memory_order_relaxed); ++ wait_node* wn = to_wait_node(n); ++ // Artificial 'if' test to work around confused armel ++ // gcc 13 compiler, see ++ // . ++ if (wn) { ++ wn->my_is_in_list.store(false, std::memory_order_relaxed); ++ } else { ++ __TBB_ASSERT(wn, "to_wait_node(n) is NULL"); ++ } + } + } + diff --git a/patches/README b/patches/README new file mode 100644 index 0000000..80c1584 --- /dev/null +++ b/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/patches/fortify-source-3.patch b/patches/fortify-source-3.patch new file mode 100644 index 0000000..c896e46 --- /dev/null +++ b/patches/fortify-source-3.patch @@ -0,0 +1,44 @@ +Description: Make sure we use FORTIFY_SOURCE=3 as defined in the dpkg script. + This fixes FTBFS +Author: Gianfranco Costamagna +Last-Update: 2023-12-27 + +Index: onetbb/cmake/compilers/Clang.cmake +=================================================================== +--- onetbb.orig/cmake/compilers/Clang.cmake ++++ onetbb/cmake/compilers/Clang.cmake +@@ -68,7 +68,7 @@ endif() + + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) + +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=2>) ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=3>) + + if (MINGW) + list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__) +Index: onetbb/cmake/compilers/GNU.cmake +=================================================================== +--- onetbb.orig/cmake/compilers/GNU.cmake ++++ onetbb/cmake/compilers/GNU.cmake +@@ -75,7 +75,7 @@ set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMO + if (NOT APPLE AND NOT MINGW) + set(TBB_LIB_LINK_FLAGS ${TBB_LIB_LINK_FLAGS} -Wl,-z,relro,-z,now,-z,noexecstack) + endif() +-set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=2> ) ++set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} $<$>:-D_FORTIFY_SOURCE=3> ) + + + # TBB malloc settings +Index: onetbb/cmake/compilers/Intel.cmake +=================================================================== +--- onetbb.orig/cmake/compilers/Intel.cmake ++++ onetbb/cmake/compilers/Intel.cmake +@@ -21,7 +21,7 @@ if (MSVC) + elseif (APPLE) + include(${CMAKE_CURRENT_LIST_DIR}/AppleClang.cmake) + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -fstack-protector -Wformat -Wformat-security +- $<$>:-fno-omit-frame-pointer -qno-opt-report-embed -D_FORTIFY_SOURCE=2>) ++ $<$>:-fno-omit-frame-pointer -qno-opt-report-embed -D_FORTIFY_SOURCE=3>) + set(TBB_OPENMP_FLAG -qopenmp) + set(TBB_IPO_COMPILE_FLAGS $<$>:-ipo>) + else() diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..52d43bf --- /dev/null +++ b/patches/series @@ -0,0 +1,10 @@ +1000-remove-unaligned-test.patch +1010-test-less-stress.patch +1020-arch-generic.patch +1030-warning-flags.patch +#1050-armel-atomic-past-buffer.patch +#fortify-source-3.patch +sh4-support.patch +sphinx-change-theme-to-avoid-ftbfs.patch +sphinx-ftbfs.patch +skip-resumable-tasks.patch diff --git a/patches/sh4-support.patch b/patches/sh4-support.patch new file mode 100644 index 0000000..0c0b67b --- /dev/null +++ b/patches/sh4-support.patch @@ -0,0 +1,44 @@ +Description: sh4 support + onetbb currently FTBFS on sh4 because the source code assumes that the target + FPU supports all four rounding modes (FE_TONEAREST, FE_DOWNWARD, FE_UPWARD and + FE_TOWARDZERO) which is not the case on sh4 which supports FE_TONEAREST and + FE_TOWARDZERO only [1]. + . + The attached patch fixes these assumptions for sh4 and makes the code build. I + have already patched and uploaded the package to the unreleased distribution + so that the mold linker can build on sh4 as well. + . + I will forward the patch later after reformating it. +Author: John Paul Adrian Glaubitz +Forwarded: not yet. +BTS: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1027168 +Index: onetbb/test/common/fp_control.h +=================================================================== +--- onetbb.orig/test/common/fp_control.h ++++ onetbb/test/common/fp_control.h +@@ -112,7 +112,11 @@ inline void SetRoundingMode ( int mode ) + + #include + ++#if defined(__sh__) ++const int RND_MODE_MASK = FE_TONEAREST | FE_TOWARDZERO; ++#else + const int RND_MODE_MASK = FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO; ++#endif + + const int NumSseModes = 1; + const int SseModes[NumSseModes] = { 0 }; +@@ -125,8 +129,13 @@ inline void SetSseMode ( int ) {} + + #endif /* Other archs */ + ++#if defined(__sh__) ++const int NumRoundingModes = 2; ++const int RoundingModes[NumRoundingModes] = { FE_TONEAREST, FE_TOWARDZERO }; ++#else + const int NumRoundingModes = 4; + const int RoundingModes[NumRoundingModes] = { FE_TONEAREST, FE_DOWNWARD, FE_UPWARD, FE_TOWARDZERO }; ++#endif + const int numFPModes = NumRoundingModes*NumSseModes; + + inline void SetFPMode( int mode ) { diff --git a/patches/skip-resumable-tasks.patch b/patches/skip-resumable-tasks.patch new file mode 100644 index 0000000..33a49c1 --- /dev/null +++ b/patches/skip-resumable-tasks.patch @@ -0,0 +1,15 @@ +Description: the masked test fails on s390x +Forward: no need +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index fb4a78bd..31a699d4 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -418,7 +418,7 @@ if (TARGET TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_task_arena DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_enumerable_thread_specific DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_concurrent_queue DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR tbb NAME test_resumable_tasks DEPENDENCIES TBB::tbb) ++ #tbb_add_test(SUBDIR tbb NAME test_resumable_tasks DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_mutex DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_function_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_multifunction_node DEPENDENCIES TBB::tbb) diff --git a/patches/sphinx-change-theme-to-avoid-ftbfs.patch b/patches/sphinx-change-theme-to-avoid-ftbfs.patch new file mode 100644 index 0000000..185722a --- /dev/null +++ b/patches/sphinx-change-theme-to-avoid-ftbfs.patch @@ -0,0 +1,39 @@ +Index: onetbb/doc/conf.py +=================================================================== +--- onetbb.orig/doc/conf.py ++++ onetbb/doc/conf.py +@@ -122,7 +122,7 @@ else: + # documentation. + # + +-html_theme = 'sphinx_book_theme' ++html_theme = 'sphinx_rtd_theme' + + if BUILD_TYPE == 'dita': + html_theme_options = { +Index: onetbb/doc/GSG/conf.py +=================================================================== +--- onetbb.orig/doc/GSG/conf.py ++++ onetbb/doc/GSG/conf.py +@@ -127,7 +127,7 @@ else: + if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita': + html_theme = 'sphinx_rtd_theme' + else: +- html_theme = 'sphinx_book_theme' ++ html_theme = 'sphinx_rtd_theme' + html_theme_options = { + 'repository_url': 'https://github.com/oneapi-src/oneTBB', + 'path_to_docs': 'doc/main', +Index: onetbb/doc/main/conf.py +=================================================================== +--- onetbb.orig/doc/main/conf.py ++++ onetbb/doc/main/conf.py +@@ -123,7 +123,7 @@ else: + if BUILD_TYPE == 'oneapi' or BUILD_TYPE == 'dita': + html_theme = 'sphinx_rtd_theme' + else: +- html_theme = 'sphinx_book_theme' ++ html_theme = 'sphinx_rtd_theme' + html_theme_options = { + 'repository_url': 'https://github.com/oneapi-src/oneTBB', + 'path_to_docs': 'doc/main', diff --git a/patches/sphinx-ftbfs.patch b/patches/sphinx-ftbfs.patch new file mode 100644 index 0000000..312db45 --- /dev/null +++ b/patches/sphinx-ftbfs.patch @@ -0,0 +1,28 @@ +Description: Fix sphinx build. #1091039 +Foward: not necessary. +diff --git a/doc/GSG/conf.py b/doc/GSG/conf.py +index e45812d1..1446f1fe 100644 +--- a/doc/GSG/conf.py ++++ b/doc/GSG/conf.py +@@ -291,7 +291,7 @@ epub_exclude_files = ['search.html'] + # -- Options for intersphinx extension --------------------------------------- + + # Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {'https://docs.python.org/': None} ++intersphinx_mapping = {'python': ('https://docs.python.org/3', None)} + + # -- Options for todo extension ---------------------------------------------- + +diff --git a/doc/main/conf.py b/doc/main/conf.py +index 6c81f8ce..12da5f28 100644 +--- a/doc/main/conf.py ++++ b/doc/main/conf.py +@@ -287,7 +287,7 @@ epub_exclude_files = ['search.html'] + # -- Options for intersphinx extension --------------------------------------- + + # Example configuration for intersphinx: refer to the Python standard library. +-intersphinx_mapping = {'https://docs.python.org/': None} ++intersphinx_mapping = {'python': ('https://docs.python.org/3', None)} + + # -- Options for todo extension ---------------------------------------------- + diff --git a/rules b/rules new file mode 100755 index 0000000..55ce7b2 --- /dev/null +++ b/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f +# export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/architecture.mk + +ifeq (alpha, $(DEB_HOST_ARCH)) +CFLAGS := $(filter-out -fstack-protector, $(CFLAGS)) +CXXFLAGS := $(filter-out -fstack-protector, $(CXXFLAGS)) +endif +ifeq (hppa, $(DEB_HOST_ARCH)) +CFLAGS := $(filter-out -fstack-clash-protection, $(CFLAGS)) +CXXFLAGS := $(filter-out -fstack-clash-protection, $(CXXFLAGS)) +endif + +ifneq (,$(filter $(DEB_BUILD_ARCH), m68k sh4)) +BUILD_FLAGS := -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS) -faligned-new" +else +BUILD_FLAGS := -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS) -Wno-error=stringop-overflow" +endif + +ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) +# Provide compiler information +BUILD_FLAGS += -DCMAKE_C_COMPILER=$(DEB_HOST_GNU_TYPE)-gcc +BUILD_FLAGS += -DCMAKE_CXX_COMPILER=$(DEB_HOST_GNU_TYPE)-g++ +endif + +# explicitly link against libatomic +ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel m68k sh4 powerpc)) +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed +endif + + +%: + dh $@ -Scmake+ninja + +override_dh_auto_clean: + dh_auto_clean + -$(RM) -rf html + +# Common CMake Flags, see upstream documentation +# https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md +override_dh_auto_configure: +ifeq (ia64,$(DEB_HOST_ARCH)) + # https://github.com/oneapi-src/oneTBB/issues/777 + # This is a quick hack to disable ITT_NOTIFY on IA64 + sed -i -e 's/__TBB_USE_ITT_NOTIFY/__TBB_NO_USE_ITT_NOTIFY/g' src/tbb/CMakeLists.txt +endif + dh_auto_configure -- \ + -DTBB_TEST=ON \ + -DTBB4PY_BUILD=OFF \ + $(BUILD_FLAGS) + +override_dh_auto_build-arch: +# dump out diagnostics + cat /proc/cpuinfo + gcc -dM -E - < /dev/null + echo Build system page size is $$(($$(getconf PAGESIZE) >> 10)) KiB + dh_auto_build + +override_dh_auto_build-indep: + sphinx-build -b html doc/main html + # strip the links to prevent privacy breach + -find html -type f -exec sed -i -e \ + 's@https://www.intel.com/content/dam/www/global/wap/performance-config.js@https://localhost/performance-config.js@g' '{}' \; + # don't ship embedded fonts + -$(RM) -rf html/_static/vendor + # remove .doctree junk + -$(RM) -rf html/.doctrees + # remove pycache + -$(RM) -rf html/_static/__pycache__ + # remove embedded javascripts. they will be provided by other system packages (see .links) + -$(RM) html/_static/*.js + +override_dh_auto_test-indep: + : + +override_dh_auto_install-indep: + : + +# Makefiles should not be compressed (tbb-examples) +override_dh_compress-indep: + dh_compress -X*/examples/* diff --git a/salsa-ci.yml b/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..247f245 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.15) +project(CXX) +find_package(TBB) + +message(" TBB_FOUND: ${TBB_FOUND}") +message(" TBB_VERSION: ${TBB_VERSION}") +message(" TBB_INTERFACE_VERSION: ${TBB_INTERFACE_VERSION}") +message(" TBB_tbb_FOUND: ${TBB_tbb_FOUND}") +message(" TBB_tbbmalloc_FOUND: ${TBB_tbbmalloc_FOUND}") +message("TBB_tbbmalloc_proxy_FOUND: ${TBB_tbbmalloc_proxy_FOUND}") +message(" TBB_IMPORTED_TARGETS: ${TBB_IMPORTED_TARGETS}") + +add_executable(testcc "${CMAKE_CURRENT_SOURCE_DIR}/test.cc") +target_link_libraries(testcc TBB::tbb) +enable_testing() +add_test(NAME testcc COMMAND testcc) diff --git a/tests/cmaketest.sh b/tests/cmaketest.sh new file mode 100755 index 0000000..9a2300b --- /dev/null +++ b/tests/cmaketest.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +cd debian/tests +cmake -Bbuild +cd build +make; make test diff --git a/tests/control b/tests/control new file mode 100644 index 0000000..540b84f --- /dev/null +++ b/tests/control @@ -0,0 +1,7 @@ +Tests: runtests.sh +Depends: build-essential, cmake, @ +Restrictions: allow-stderr + +Tests: cmaketest.sh +Depends: build-essential, cmake, @ +Restrictions: allow-stderr diff --git a/tests/runtests.sh b/tests/runtests.sh new file mode 100755 index 0000000..443ceca --- /dev/null +++ b/tests/runtests.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e +ncpu="$(grep 'processor' /proc/cpuinfo | wc -l)" +cd examples +cmake -Bbuild . +cd build +make -j${ncpu} +testbins=( $(find . -type f -executable | sort | grep -v CMake) ) +echo The testbins are: ${testbins[@]} +for bin in ${testbins[@]}; do + echo running ${bin} ... + if (echo ${bin} | grep -o fgbzip2 >/dev/null); then + ./${bin} -b=9 -async ${bin} + elif test tachyon = $(basename ${bin}); then + echo skipped. + elif (echo ${bin} | grep -o fractal >/dev/null); then + ./${bin} auto max-of-iterations=1000 + elif (echo ${bin} | grep -o sub_string_finder_simple >/dev/null); then + ./${bin} silent + elif (echo ${bin} | grep -o logic_sim >/dev/null); then + ./${bin} silent + elif (echo ${bin} | grep -o recursive_fibonacci >/dev/null); then + ./${bin} 32 # making test faster. + else + ./${bin} + fi +done +cd .. +rm -rf build diff --git a/tests/test.cc b/tests/test.cc new file mode 100644 index 0000000..e44d5f7 --- /dev/null +++ b/tests/test.cc @@ -0,0 +1,13 @@ +// https://oneapi-src.github.io/oneTBB/main/tbb_userguide/Migration_Guide/Task_Scheduler_Init.html +#include +#include +#include +#include +#include +#include +int main() +{ + int num_threads = oneapi::tbb::info::default_concurrency(); + std::cout << num_threads << std::endl; + return 0; +} diff --git a/upstream/metadata b/upstream/metadata new file mode 100644 index 0000000..436edc1 --- /dev/null +++ b/upstream/metadata @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/oneapi-src/oneTBB/issues +Bug-Submit: https://github.com/oneapi-src/oneTBB/issues/new +Repository: https://github.com/oneapi-src/oneTBB.git +Repository-Browse: https://github.com/oneapi-src/oneTBB diff --git a/watch b/watch new file mode 100644 index 0000000..18b0aef --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=4 +opts="compression=xz,repack,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ +https://github.com/oneapi-src/oneTBB/tags \ +(?:.*?/)?v?(\d[\d.]*)\.tar\.gz