From 0329aee6e07dd7147e5c63bae2304d337b02cc691d6861bd78172de40d91bc81 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 22 Feb 2023 10:58:13 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/heaptrack?expand=0&rev=37 --- ...-when-__libc_dlopen_mode-is-detected.patch | 24 +++++++++++++++++++ heaptrack.changes | 6 +++++ heaptrack.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch diff --git a/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch b/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch new file mode 100644 index 0000000..18e17f7 --- /dev/null +++ b/0001-Return-early-when-__libc_dlopen_mode-is-detected.patch @@ -0,0 +1,24 @@ +From 161bd9f7f352cbc24f36e37f9686d18f5d40c268 Mon Sep 17 00:00:00 2001 +From: Milian Wolff +Date: Mon, 11 Jul 2022 15:54:56 +0200 +Subject: [PATCH] Return early when __libc_dlopen_mode is detected + +--- + src/track/heaptrack_env.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/track/heaptrack_env.cpp b/src/track/heaptrack_env.cpp +index b48e384..36da2ff 100644 +--- a/src/track/heaptrack_env.cpp ++++ b/src/track/heaptrack_env.cpp +@@ -26,6 +26,7 @@ void dlopenLine(const char* lib) + if (&__libc_dlopen_mode) { + // __libc_dlopen_mode was available directly in glibc before libdl got merged into it + fprintf(stdout, "__libc_dlopen_mode(\"%s\", 0x80000000 | 0x002)\n", lib); ++ return; + } + + #ifdef __USE_GNU +-- +2.39.2 + diff --git a/heaptrack.changes b/heaptrack.changes index b5d8f6b..ed71e2d 100644 --- a/heaptrack.changes +++ b/heaptrack.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 22 10:57:50 UTC 2023 - Christophe Marin + +- Add upstream change: + * 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch + ------------------------------------------------------------------- Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin diff --git a/heaptrack.spec b/heaptrack.spec index 94f2456..48d41d9 100644 --- a/heaptrack.spec +++ b/heaptrack.spec @@ -33,6 +33,8 @@ Source2: heaptrack.keyring Patch0: 0001-Fix-build-with-gcc-13-by-including-cstdint.patch # PATCH-FIX-UPSTREAM Patch1: 0001-Add-missing-include.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libboost_container-devel