7 files changed, 60 insertions, 3 deletions
diff --git a/dev-cpp/tbb/files/tbb-2020.3-musl.patch b/dev-cpp/tbb/files/tbb-2020.3-musl.patch
new file mode 100644
index 000000000000..b70dc14f9bd8
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2020.3-musl.patch
@@ -0,0 +1,22 @@
+--- a/src/tbbmalloc/proxy.cpp	2026-03-27 10:55:33.235747857 +0100
++++ b/src/tbbmalloc/proxy.cpp	2026-03-27 11:06:44.816616969 +0100
+@@ -24,7 +24,8 @@
+ // 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_PREREQ) && !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
++#if defined(__GLIBC_PREREQ)
++#if !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
+ // tell <cstdlib> that there is no aligned_alloc
+ #undef _GLIBCXX_HAVE_ALIGNED_ALLOC
+ // trick <stdlib.h> to define another symbol instead
+@@ -32,7 +33,8 @@
+ // Fix the state and undefine the trick
+ #include <cstdlib>
+ #undef aligned_alloc
+-#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
++#endif // !__GLIBC_PREREQ(2, 16) && _GLIBCXX_HAVE_ALIGNED_ALLOC
++#endif // defined(__GLIBC_PREREQ)
+ #endif // __linux__ && !__ANDROID__
+ 
+ #include "proxy.h"
diff --git a/dev-cpp/tbb/files/tbb-2021.7.0-abort.patch b/dev-cpp/tbb/files/tbb-2021.7.0-abort.patch
new file mode 100644
index 000000000000..0a7deec96a5d
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.7.0-abort.patch
@@ -0,0 +1,11 @@
+--- a/test/common/utils_assert.h	2026-03-27 11:39:14.886058730 +0100
++++ b/test/common/utils_assert.h	2026-03-27 11:40:24.429306039 +0100
+@@ -20,6 +20,8 @@
+ #include "config.h"
+ #include "utils_report.h"
+ 
++#include <cstdlib>
++
+ #define REPORT_FATAL_ERROR REPORT
+ 
+ namespace utils {
diff --git a/dev-cpp/tbb/files/tbb-2021.7.0-dynamicLink.patch b/dev-cpp/tbb/files/tbb-2021.7.0-dynamicLink.patch
new file mode 100644
index 000000000000..ca44d7985a30
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.7.0-dynamicLink.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt	2026-03-27 13:13:21.627057086 +0100
++++ b/test/CMakeLists.txt	2026-03-27 13:17:16.113296894 +0100
+@@ -367,6 +367,7 @@
+     tbb_add_test(SUBDIR tbb NAME test_allocators DEPENDENCIES TBB::tbb)
+     tbb_add_test(SUBDIR tbb NAME test_arena_priorities DEPENDENCIES TBB::tbb)
+     tbb_add_test(SUBDIR tbb NAME test_dynamic_link DEPENDENCIES TBB::tbb)
++    set_target_properties(test_dynamic_link PROPERTIES ENABLE_EXPORTS TRUE)
+     if (WIN32)
+         tbb_add_test(SUBDIR tbb NAME test_numa_dist DEPENDENCIES TBB::tbb)
+     endif()
diff --git a/dev-cpp/tbb/files/tbb-2021.9.0-dynamicLink.patch b/dev-cpp/tbb/files/tbb-2021.9.0-dynamicLink.patch
new file mode 100644
index 000000000000..77c9ca68ba0b
--- /dev/null
+++ b/dev-cpp/tbb/files/tbb-2021.9.0-dynamicLink.patch
@@ -0,0 +1,10 @@
+--- a/test/CMakeLists.txt	2026-03-27 14:52:17.592128499 +0100
++++ b/test/CMakeLists.txt	2026-03-27 14:53:30.563265543 +0100
+@@ -375,6 +375,7 @@
+     tbb_add_test(SUBDIR tbb NAME test_allocators DEPENDENCIES TBB::tbb)
+     tbb_add_test(SUBDIR tbb NAME test_arena_priorities DEPENDENCIES TBB::tbb)
+     tbb_add_test(SUBDIR tbb NAME test_dynamic_link DEPENDENCIES TBB::tbb)
++    set_target_properties(test_dynamic_link PROPERTIES ENABLE_EXPORTS TRUE)
+     if (LINKER_HAS_NO_AS_NEEDED)
+         # The linker may not detect a dependency on pthread in static variable constructors.
+         target_link_libraries(test_dynamic_link PRIVATE "-Wl,--no-as-needed")
diff --git a/dev-cpp/tbb/tbb-2020.3.ebuild b/dev-cpp/tbb/tbb-2020.3.ebuild
index aab01a10281a..7ff327bd8f37 100644
--- a/dev-cpp/tbb/tbb-2020.3.ebuild
+++ b/dev-cpp/tbb/tbb-2020.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ DOCS=( CHANGES README README.md doc/Release_Notes.txt )
 PATCHES=(
 	"${FILESDIR}"/${PN}-2020.1-makefile-debug.patch
 	"${FILESDIR}"/${PN}-2020.3-gcc13.patch
+	"${FILESDIR}"/${PN}-2020.3-musl.patch
 )
 
 src_prepare() {
diff --git a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
index 49a6f1bea630..e2a5696508de 100644
--- a/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
+++ b/dev-cpp/tbb/tbb-2021.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +24,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.7.0-pthread-eagain.patch
+	"${FILESDIR}"/${PN}-2021.7.0-abort.patch
+	"${FILESDIR}"/${P}-dynamicLink.patch
 )
 
 src_configure() {
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index daeaf3583eeb..e889b2f3e312 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2021.8.0-gcc-13.patch
 	"${FILESDIR}"/${PN}-2021.13.0-test-atomics.patch
+	"${FILESDIR}"/${P}-dynamicLink.patch
 )
 
 src_prepare() {