diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2020-08-20 23:27:24 +0300 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2020-08-31 10:39:35 +0200 |
| commit | 4ced3010ad1133159eb48bedda92af93e3a73d5a (patch) | |
| tree | cfed684caf561ecb079f6845a971c59742ebcc55 /libdwfl/libdwflP.h | |
| parent | df91c6af98ac09acce5a906afef3e3fe21b24734 (diff) | |
| download | elfutils-4ced3010ad1133159eb48bedda92af93e3a73d5a.tar.gz | |
libdwfl: do not dlopen libdebuginfod.so in --disable-libdebuginfod mode
debuginfod-client.c used to try to dlopen libdebuginfod.so even if
libdebuginfod was completely disabled using --disable-libdebuginfod.
Fix this by disabling build of debuginfod-client.c and disabling all
__libdwfl_debuginfod_* invocations in --disable-libdebuginfod mode.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'libdwfl/libdwflP.h')
| -rw-r--r-- | libdwfl/libdwflP.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libdwfl/libdwflP.h b/libdwfl/libdwflP.h index 25753de2..ad6779ad 100644 --- a/libdwfl/libdwflP.h +++ b/libdwfl/libdwflP.h @@ -40,7 +40,10 @@ #include "../libdw/libdwP.h" /* We need its INTDECLs. */ #include "../libdwelf/libdwelfP.h" + +#ifdef ENABLE_LIBDEBUGINFOD #include "../debuginfod/debuginfod.h" +#endif typedef struct Dwfl_Process Dwfl_Process; @@ -115,8 +118,9 @@ struct Dwfl_User_Core struct Dwfl { const Dwfl_Callbacks *callbacks; +#ifdef ENABLE_LIBDEBUGINFOD debuginfod_client *debuginfod; - +#endif Dwfl_Module *modulelist; /* List in order used by full traversals. */ Dwfl_Process *process; @@ -631,6 +635,7 @@ extern Dwfl_Error __libdw_open_elf (int fd, Elf **elfp) internal_function; extern bool __libdwfl_dynamic_vaddr_get (Elf *elf, GElf_Addr *vaddrp) internal_function; +#ifdef ENABLE_LIBDEBUGINFOD /* Internal interface to libdebuginfod (if installed). */ int __libdwfl_debuginfod_find_executable (Dwfl *dwfl, @@ -642,6 +647,7 @@ __libdwfl_debuginfod_find_debuginfo (Dwfl *dwfl, size_t build_id_len); void __libdwfl_debuginfod_end (debuginfod_client *c); +#endif /* These are working nicely for --core, but are not ready to be |