Christophe Marin 2023-02-22 10:58:13 +00:00 committed by Git OBS Bridge
parent 095f03549e
commit 0329aee6e0
3 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,24 @@
From 161bd9f7f352cbc24f36e37f9686d18f5d40c268 Mon Sep 17 00:00:00 2001
From: Milian Wolff <mail@milianw.de>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 22 10:57:50 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Add upstream change:
* 0001-Return-early-when-__libc_dlopen_mode-is-detected.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin <christophe@krop.fr> Tue Feb 7 23:22:36 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

@ -33,6 +33,8 @@ Source2: heaptrack.keyring
Patch0: 0001-Fix-build-with-gcc-13-by-including-cstdint.patch Patch0: 0001-Fix-build-with-gcc-13-by-including-cstdint.patch
# PATCH-FIX-UPSTREAM # PATCH-FIX-UPSTREAM
Patch1: 0001-Add-missing-include.patch 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: extra-cmake-modules
BuildRequires: kf5-filesystem BuildRequires: kf5-filesystem
BuildRequires: libboost_container-devel BuildRequires: libboost_container-devel