commit: f3cd6cd18b7f54edfedbd0015b28ce20b4bbcba6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jan 16 06:45:33 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 06:45:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3cd6cd1
dev-cpp/tbb: fix build on musl Closes: https://bugs.gentoo.org/830698 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch | 25 ++++++++++++++++++++++ dev-cpp/tbb/tbb-2021.5.0.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch new file mode 100644 index 000000000000..014a3863f452 --- /dev/null +++ b/dev-cpp/tbb/files/tbb-2021.5.0-musl-deepbind.patch @@ -0,0 +1,25 @@ +https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38 +https://bugs.gentoo.org/830698 + +From: Khem Raj <raj.k...@gmail.com> +Date: Wed, 15 Dec 2021 08:08:07 -0800 +Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684) + +Exclude non-glibc linux systems along with android +Fixes +src/tbb/dynamic_link.cpp:417:29: error: use + of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND; +| ^ + +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- a/src/tbb/dynamic_link.cpp ++++ b/src/tbb/dynamic_link.cpp +@@ -413,7 +413,7 @@ namespace r1 { + int flags = RTLD_NOW; + if (local_binding) { + flags = flags | RTLD_LOCAL; +-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS ++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS + flags = flags | RTLD_DEEPBIND; + #endif + } else { diff --git a/dev-cpp/tbb/tbb-2021.5.0.ebuild b/dev-cpp/tbb/tbb-2021.5.0.ebuild index 0a18fece5fd1..2ab975036c65 100644 --- a/dev-cpp/tbb/tbb-2021.5.0.ebuild +++ b/dev-cpp/tbb/tbb-2021.5.0.ebuild @@ -25,6 +25,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( # should be in.. 2022? "${FILESDIR}"/${PN}-2021.4.0-lto.patch + "${FILESDIR}"/${PN}-2021.5.0-musl-deepbind.patch ) src_configure() {
