snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

tbb: fix *-musl 

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2018-10-17 14:08:12 +02:00
parent 40f29fcbe3
commit 41d9e1e6bd
No known key found for this signature in database
GPG Key ID: 6764EC32352D0647
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srcpkgs/tbb/patches/musl.patch Normal file
View File

@ -0,0 +1,18 @@
--- src/tbbmalloc/proxy.cpp.orig 2018-10-17 14:05:31.311723013 +0200
+++ 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 <cstdlib> that there is no aligned_alloc
#undef _GLIBCXX_HAVE_ALIGNED_ALLOC
@@ -37,6 +38,7 @@
#include <cstdlib>
#undef aligned_alloc
#endif // defined(__GLIBC_PREREQ)&&!__GLIBC_PREREQ(2, 16)&&_GLIBCXX_HAVE_ALIGNED_ALLOC
+#endif // defined(__GLIBC__)
#endif // __linux__ && !__ANDROID__
#include "proxy.h"

3
srcpkgs/tbb/template
View File

@ -16,9 +16,6 @@ checksum=a4875c6b6853213083e52ecd303546bdf424568ec67cfc7e51d132a7c037c66a
only_for_archs="i686-musl x86_64-musl armv7l-musl aarch64-musl i686 x86_64 armv7l aarch64" only_for_archs="i686-musl x86_64-musl armv7l-musl aarch64-musl i686 x86_64 armv7l aarch64"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl)
broken="../../src/tbbmalloc/proxy.cpp:31:47: error: missing binary operator before token ("
;;
armv7l*) armv7l*)
make_build_args="arch=armv7" make_build_args="arch=armv7"
;; ;;