From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] heaptrack: update to 1.3.0.
Date: Fri, 07 Jan 2022 00:58:24 +0100 [thread overview]
Message-ID: <20220106235824.4Dt6_fkBQbUEk_elA0MPbzoE1rXcjI-VHghPx-eDwYw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34880@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2022-01-06 23:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 23:30 [PR PATCH] " Piraty
2022-01-06 23:58 ` Piraty [this message]
2022-01-07 21:08 ` [PR PATCH] [Updated] " Piraty
2022-01-08 18:44 ` Piraty
2022-01-09 12:28 ` Piraty
2022-01-09 13:25 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220106235824.4Dt6_fkBQbUEk_elA0MPbzoE1rXcjI-VHghPx-eDwYw@z \
--to=piraty@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).