0001-src-symbolize.cc-fix-build-without-dlfcn.h.patch 1.0 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From f71e0899439aaa0e6172243a0862bf8a72a241fc Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Mon, 28 Oct 2019 18:21:55 +0100
  4. Subject: [PATCH] src/symbolize.cc: fix build without dlfcn.h
  5. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  6. [Upstream status: https://github.com/google/glog/pull/475]
  7. ---
  8. src/symbolize.cc | 4 +++-
  9. 1 file changed, 3 insertions(+), 1 deletion(-)
  10. diff --git a/src/symbolize.cc b/src/symbolize.cc
  11. index 1ffc607..ff027f2 100644
  12. --- a/src/symbolize.cc
  13. +++ b/src/symbolize.cc
  14. @@ -110,7 +110,9 @@ _END_GOOGLE_NAMESPACE_
  15. #if defined(__ELF__)
  16. +#if defined(HAVE_DLFCN_H)
  17. #include <dlfcn.h>
  18. +#endif
  19. #if defined(OS_OPENBSD)
  20. #include <sys/exec_elf.h>
  21. #else
  22. @@ -832,7 +834,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out,
  23. _END_GOOGLE_NAMESPACE_
  24. -#elif defined(OS_MACOSX) && defined(HAVE_DLADDR)
  25. +#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) && defined(HAVE_DLFCN_H)
  26. #include <dlfcn.h>
  27. #include <string.h>
  28. --
  29. 2.23.0