OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Search for execinfo.h

Browse Source 
Rather than checking __GLIBC__/__UCLIBC__ macros as a proxy for
execinfo.h presence, just check directly. This allows the build to work
on musl.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Jory Pratt
2019-05-07 21:47:40 -05:00
committed by Matt Turner
parent fd7b7f14d8
commit 10e8d46601
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -1036,7 +1036,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
pre_args += '-DMAJOR_IN_MKDEV' pre_args += '-DMAJOR_IN_MKDEV'
endif endif
foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h'] foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h']
if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h)) if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify()) pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif endif

8
src/gallium/auxiliary/util/u_debug_symbol.c
View File

@@ -219,7 +219,7 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size)
#endif /* PIPE_OS_WINDOWS */ #endif /* PIPE_OS_WINDOWS */
#if defined(__GLIBC__) && !defined(__UCLIBC__) #if defined(HAVE_EXECINFO_H)
#include <execinfo.h> #include <execinfo.h>
@@ -240,7 +240,7 @@ debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
return TRUE; return TRUE;
} }
#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */ #endif /* defined(HAVE_EXECINFO_H) */
void void
@@ -252,11 +252,11 @@ debug_symbol_name(const void *addr, char* buf, unsigned size)
} }
#endif #endif
#if defined(__GLIBC__) && !defined(__UCLIBC__) #if defined(HAVE_EXECINFO_H)
if (debug_symbol_name_glibc(addr, buf, size)) { if (debug_symbol_name_glibc(addr, buf, size)) {
return; return;
} }
#endif #endif /* defined(HAVE_EXECINFO_H) */
util_snprintf(buf, size, "%p", addr); util_snprintf(buf, size, "%p", addr);
buf[size - 1] = 0; buf[size - 1] = 0;

2
src/mapi/glapi/gen/gl_gentable.py
View File

@@ -45,7 +45,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
#endif #endif
#if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H))
#define USE_BACKTRACE #define USE_BACKTRACE
#endif #endif

2
src/mesa/drivers/dri/i915/intel_regions.c
View File

@@ -57,7 +57,7 @@
*/ */
#define DEBUG_BACKTRACE_SIZE 0 #define DEBUG_BACKTRACE_SIZE 0
#if DEBUG_BACKTRACE_SIZE == 0 #if DEBUG_BACKTRACE_SIZE == 0 || !defined(HAVE_EXECINFO_H)
/* Use the standard debug output */ /* Use the standard debug output */
#define _DBG(...) DBG(__VA_ARGS__) #define _DBG(...) DBG(__VA_ARGS__)
#else #else