[PR PATCH] heaptrack: update to 1.3.0.

[PR PATCH] heaptrack: update to 1.3.0.

[Piraty]

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

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

https://github.com/Piraty/void-packages heaptrack-1.3.0
https://github.com/void-linux/void-packages/pull/34880

heaptrack: update to 1.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-heaptrack-1.3.0-34880.patch --]
[-- Type: text/x-diff, Size: 4005 bytes --]

From c85d73f93f4b494f8255b0b55988a1b20a4867bb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 76 ++++++++--------------
 srcpkgs/heaptrack/template                 |  4 +-
 2 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..aa190da5fdf4 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,44 @@
-# reason: fix sources to work correctly with musl
-
+diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
+index fe8d174..4ee0326 100644
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
+@@ -17,6 +17,7 @@
  #include <unistd.h>
-+#include <dlfcn.h>
  
  #include <sys/mman.h>
++#include <sys/reg.h>
  
+ #include <type_traits>
+ 
+diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp
+index 70f74eb..51d64e4 100644
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
-
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+diff --git a/tests/manual/dlopen.cpp b/tests/manual/dlopen.cpp
+index bc1972d..5c3d1fc 100644
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,7 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifdef RTLD_DEEPBIND
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -28,5 +29,6 @@ int main()
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
++#endif
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..c1f8dfa8581c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

Re: [PR PATCH] [Updated] heaptrack: update to 1.3.0.

[Piraty]

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

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

https://github.com/Piraty/void-packages heaptrack-1.3.0
https://github.com/void-linux/void-packages/pull/34880

heaptrack: update to 1.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-heaptrack-1.3.0-34880.patch --]
[-- Type: text/x-diff, Size: 4066 bytes --]

From dcc440f5a247464395689a2b254984abccdcc6f7 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 76 ++++++++--------------
 srcpkgs/heaptrack/template                 |  7 +-
 2 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..aa190da5fdf4 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,44 @@
-# reason: fix sources to work correctly with musl
-
+diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
+index fe8d174..4ee0326 100644
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
+@@ -17,6 +17,7 @@
  #include <unistd.h>
-+#include <dlfcn.h>
  
  #include <sys/mman.h>
++#include <sys/reg.h>
  
+ #include <type_traits>
+ 
+diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp
+index 70f74eb..51d64e4 100644
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
-
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+diff --git a/tests/manual/dlopen.cpp b/tests/manual/dlopen.cpp
+index bc1972d..5c3d1fc 100644
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,7 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifdef RTLD_DEEPBIND
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -28,5 +29,6 @@ int main()
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
++#endif
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..8d8859611b4c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,10 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
+
+#../tests/auto/tst_inject.cpp:78: SIGSEGV
+make_check=no
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

Re: [PR PATCH] [Updated] heaptrack: update to 1.3.0.

[Piraty]

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

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

https://github.com/Piraty/void-packages heaptrack-1.3.0
https://github.com/void-linux/void-packages/pull/34880

heaptrack: update to 1.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-heaptrack-1.3.0-34880.patch --]
[-- Type: text/x-diff, Size: 4067 bytes --]

From dab4d1402914903f6de90250762f59d6ce0dd707 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 76 ++++++++--------------
 srcpkgs/heaptrack/template                 |  7 +-
 2 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..6e9ecfd92129 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,44 @@
-# reason: fix sources to work correctly with musl
-
+diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
+index fe8d174..4ee0326 100644
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
+@@ -17,6 +17,7 @@
  #include <unistd.h>
-+#include <dlfcn.h>
  
  #include <sys/mman.h>
++#include <sys/user.h>
  
+ #include <type_traits>
+ 
+diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp
+index 70f74eb..51d64e4 100644
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
-
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+diff --git a/tests/manual/dlopen.cpp b/tests/manual/dlopen.cpp
+index bc1972d..5c3d1fc 100644
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,7 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifdef RTLD_DEEPBIND
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -28,5 +29,6 @@ int main()
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
++#endif
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..8d8859611b4c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,10 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
+
+#../tests/auto/tst_inject.cpp:78: SIGSEGV
+make_check=no
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

Re: [PR PATCH] [Updated] heaptrack: update to 1.3.0.

[Piraty]

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

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

https://github.com/Piraty/void-packages heaptrack-1.3.0
https://github.com/void-linux/void-packages/pull/34880

heaptrack: update to 1.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-heaptrack-1.3.0-34880.patch --]
[-- Type: text/x-diff, Size: 4112 bytes --]

From bf5b614b29a70fa7be41aceddff679ebf9678495 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 78 ++++++++--------------
 srcpkgs/heaptrack/template                 |  7 +-
 2 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..5ed862546682 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,46 @@
-# reason: fix sources to work correctly with musl
-
+diff --git a/src/track/heaptrack_inject.cpp b/src/track/heaptrack_inject.cpp
+index fe8d174..3acd7e4 100644
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
+@@ -17,6 +17,9 @@
  #include <unistd.h>
-+#include <dlfcn.h>
  
  #include <sys/mman.h>
++#ifndef __GLIBC__
++#include <sys/reg.h> /* __WORDSIZE */
++#endif
  
+ #include <type_traits>
+ 
+diff --git a/src/track/libheaptrack.cpp b/src/track/libheaptrack.cpp
+index 70f74eb..51d64e4 100644
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
-
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+diff --git a/tests/manual/dlopen.cpp b/tests/manual/dlopen.cpp
+index bc1972d..5c3d1fc 100644
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,7 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifdef RTLD_DEEPBIND
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -28,5 +29,6 @@ int main()
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
++#endif
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..8d8859611b4c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,10 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
+
+#../tests/auto/tst_inject.cpp:78: SIGSEGV
+make_check=no
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

Re: [PR PATCH] [Updated] heaptrack: update to 1.3.0.

[Piraty]

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

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

https://github.com/Piraty/void-packages heaptrack-1.3.0
https://github.com/void-linux/void-packages/pull/34880

heaptrack: update to 1.3.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-heaptrack-1.3.0-34880.patch --]
[-- Type: text/x-diff, Size: 4125 bytes --]

From 8f25949f8544d59417d1324a34291bb18d034c5c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 6 Jan 2022 00:16:19 +0100
Subject: [PATCH] heaptrack: update to 1.3.0.

---
 srcpkgs/heaptrack/patches/musl-fixes.patch | 87 +++++++++-------------
 srcpkgs/heaptrack/template                 |  7 +-
 2 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/srcpkgs/heaptrack/patches/musl-fixes.patch b/srcpkgs/heaptrack/patches/musl-fixes.patch
index 61e0d787c8f3..2cfb9a13db02 100644
--- a/srcpkgs/heaptrack/patches/musl-fixes.patch
+++ b/srcpkgs/heaptrack/patches/musl-fixes.patch
@@ -1,68 +1,51 @@
-# reason: fix sources to work correctly with musl
-
 --- a/src/track/heaptrack_inject.cpp
 +++ b/src/track/heaptrack_inject.cpp
-@@ -27,6 +27,7 @@
- #include <link.h>
- #include <malloc.h>
- #include <unistd.h>
-+#include <dlfcn.h>
- 
- #include <sys/mman.h>
+@@ -26,6 +26,15 @@
+  * @brief Experimental support for symbol overloading after runtime injection.
+  */
  
++#ifndef __WORDSIZE
++#include <limits.h>
++#if ULONG_MAX == 0xffffffffffffffff
++#define __WORDSIZE 64
++#elif ULONG_MAX == 0xffffffff
++#define __WORDSIZE 32
++#endif
++#endif
++
+ #ifndef ELF_R_SYM
+ #if __WORDSIZE == 64
+ #define ELF_R_SYM(i) ELF64_R_SYM(i)
+
 --- a/src/track/libheaptrack.cpp
 +++ b/src/track/libheaptrack.cpp
-@@ -72,7 +72,7 @@
+@@ -80,7 +80,7 @@ chrono::milliseconds elapsedTime()
      return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
  }
  
 -__pid_t gettid()
 +pid_t gettid()
  {
+ #ifdef __linux__
      return syscall(SYS_gettid);
- }
 
---- a/src/track/heaptrack_inject.cpp
-+++ b/src/track/heaptrack_inject.cpp
-@@ -38,9 +38,10 @@
-  * @brief Experimental support for symbol overloading after runtime injection.
-  */
+--- a/tests/manual/dlopen.cpp
++++ b/tests/manual/dlopen.cpp
+@@ -9,6 +9,9 @@ __attribute__((weak)) extern void allocFromLib(bool leak);
  
--#if __WORDSIZE == 64
-+#include <limits.h>
-+#if ULONG_MAX == 0xffffffffffffffff
- #define ELF_R_SYM(i) ELF64_R_SYM(i)
--#elif __WORDSIZE == 32
-+#elif ULONG_MAX == 0xffffffff
- #define ELF_R_SYM(i) ELF32_R_SYM(i)
- #else
- #error unsupported word size
-
-# simplify stdint.h include which failed on musl due to obscure assumptions
---- a/3rdparty/libbacktrace/backtrace.h
-+++ b/3rdparty/libbacktrace/backtrace.h
-@@ -36,24 +36,8 @@
- #include <stddef.h>
- #include <stdio.h>
+ int main()
+ {
++#ifndef RTLD_DEEPBIND
++    printf("SKIP (RTLD_DEEPBIND undefined)\n");
++#else
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
  
--/* We want to get a definition for uintptr_t, but we still care about
--   systems that don't have <stdint.h>.  */
--#if defined(__GLIBC__) && __GLIBC__ >= 2
--
--#include <stdint.h>
--
--#elif defined(HAVE_STDINT_H)
--
- #include <stdint.h>
+@@ -27,6 +30,7 @@ int main()
  
--#else
--
--/* Systems that don't have <stdint.h> must provide gstdint.h, e.g.,
--   from GCC_HEADER_STDINT in configure.ac.  */
--#include "gstdint.h"
--
--#endif
--
- #ifdef __cplusplus
- extern "C" {
- #endif
+     fprintf(stderr, "malloc address: %p\n", dlsym(RTLD_NEXT, "malloc"));
+     fprintf(stderr, "free address: %p\n", dlsym(RTLD_NEXT, "free"));
++#endif
+ 
+     return 0;
+ }
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index f4f4c35044f7..8d8859611b4c 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,6 +1,6 @@
 # Template file for 'heaptrack'
 pkgname=heaptrack
-version=1.2.0
+version=1.3.0
 revision=1
 build_style=cmake
 configure_args="-DHEAPTRACK_BUILD_GUI=ON"
@@ -15,7 +15,10 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/KDE/heaptrack"
 distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
-checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
+checksum=794b067772f4e4219bb7b6ff1bc1b2134b1b242e748a2cc5c47626040c631956
+
+#../tests/auto/tst_inject.cpp:78: SIGSEGV
+make_check=no
 
 heaptrack-gui_package() {
 	short_desc+=" - GUI"

Re: [PR PATCH] [Merged]: heaptrack: update to 1.3.0.

[Piraty]

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

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

heaptrack: update to 1.3.0.
https://github.com/void-linux/void-packages/pull/34880

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

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

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

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->