[PR PATCH] tbb: fix tbbmalloc_proxy on musl

[PR PATCH] tbb: fix tbbmalloc_proxy on musl

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]

There is a new pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb-musl
https://github.com/void-linux/void-packages/pull/50247

tbb: fix tbbmalloc_proxy on musl
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, **aarch64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - x86_64-musl
  - i686
  - aarch64
  - aarch64-musl
  - armv7l (cross)
  - armv7l-msul (cross)
  - armv6l (cross)
  - armv6l-musl (cross)

This fixes a linker error when trying to build a project with tbbmalloc_proxy on musl systems



A patch file from https://github.com/void-linux/void-packages/pull/50247.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-musl-50247.patch --]
[-- Type: text/x-diff, Size: 1114 bytes --]

From 1ec9705224201481ebf18bd2621174ba13c302c7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 8 May 2024 12:51:50 -0400
Subject: [PATCH] tbb: fix tbbmalloc_proxy on musl

---
 srcpkgs/tbb/template | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index bd797f044d7434..59e103cc3221d0 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,7 +1,7 @@
 # Template file for 'tbb'
 pkgname=tbb
 version=2021.11.0
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
 makedepends="libgomp-devel libhwloc-devel"
@@ -27,13 +27,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
 fi
 
-post_extract() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc_proxy/proxy.h
-	fi
-}
-
 post_install() {
 	# The Python package is installed as an egg, which is deprecated
 	# and isn't added to the Python path, so just unpack it.

Re: [PR PATCH] [Updated] tbb: fix tbbmalloc_proxy on musl

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages tbb-musl
https://github.com/void-linux/void-packages/pull/50247

tbb: fix tbbmalloc_proxy on musl
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, **aarch64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - x86_64-musl
  - i686
  - aarch64
  - aarch64-musl
  - armv7l (cross)
  - armv7l-msul (cross)
  - armv6l (cross)
  - armv6l-musl (cross)

This fixes a linker error when trying to build a project with tbbmalloc_proxy on musl systems



A patch file from https://github.com/void-linux/void-packages/pull/50247.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tbb-musl-50247.patch --]
[-- Type: text/x-diff, Size: 1114 bytes --]

From aadb4949024709e2a7c8ec3d5941b39f57d7b2b8 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 8 May 2024 12:51:50 -0400
Subject: [PATCH] tbb: fix tbbmalloc_proxy on musl

---
 srcpkgs/tbb/template | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template
index 57e75331e2a358..9ca4d71da43150 100644
--- a/srcpkgs/tbb/template
+++ b/srcpkgs/tbb/template
@@ -1,7 +1,7 @@
 # Template file for 'tbb'
 pkgname=tbb
 version=2021.12.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF"
 makedepends="libgomp-devel libhwloc-devel"
@@ -27,13 +27,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lucontext"
 fi
 
-post_extract() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -e "s@#define MALLOC_UNIXLIKE_OVERLOAD_ENABLED __linux__@@" \
-		  -i src/tbbmalloc_proxy/proxy.h
-	fi
-}
-
 post_install() {
 	# The Python package is installed as an egg, which is deprecated
 	# and isn't added to the Python path, so just unpack it.

Re: tbb: fix tbbmalloc_proxy on musl

[Calandracas606]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New comment by Calandracas606 on void-packages repository

https://github.com/void-linux/void-packages/pull/50247#issuecomment-2124852397

Comment:
@thypon 

Re: [PR PATCH] [Merged]: tbb: fix tbbmalloc_proxy on musl

[thypon]

[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]

There's a merged pull request on the void-packages repository

tbb: fix tbbmalloc_proxy on musl
https://github.com/void-linux/void-packages/pull/50247

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, **aarch64-musl**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - x86_64-musl
  - i686
  - aarch64
  - aarch64-musl
  - armv7l (cross)
  - armv7l-msul (cross)
  - armv6l (cross)
  - armv6l-musl (cross)

This fixes a linker error when trying to build a project with tbbmalloc_proxy on musl systems