dev-cpp/tbb: Fix token is not a valid

Closes: https://bugs.gentoo.org/896202
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
Alfredo Tupone
2026-03-27 11:30:11 +01:00
parent 7384c74bf4
commit 6eb872ddcb
2 changed files with 24 additions and 1 deletions

View File

@@ -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"

View File

@@ -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() {