From: Anthony G. Basile <blueness@gentoo.org>
Date: Tue, 28 May 2013 22:58:10 +0000 (+0000)
Subject: gallium: fix build on uclibc system
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22f1add9687ac272bc731b6612bfee50bdbf2f7e;p=mesa.git

gallium: fix build on uclibc system

execinfo.h and debug_symbol_name_glibc() are pure GNU-isms and do not
build on uclibc systems.  A previous patch addressed this issue, but
there was an error.  This patch corrects that error.  See

  https://bugs.freedesktop.org/show_bug.cgi?id=51782
  https://bugs.gentoo.org/show_bug.cgi?id=469768

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
index 3d2f8ebc31b..0ef111c3b24 100644
--- a/src/gallium/auxiliary/util/u_debug_symbol.c
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
@@ -151,10 +151,8 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size)
 }
 #endif
 
-#ifdef __GLIBC__
-#ifndef __UCLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
 #include <execinfo.h>
-#endif
 
 /* This can only provide dynamic symbols, or binary offsets into a file.
  *
@@ -179,7 +177,7 @@ debug_symbol_name(const void *addr, char* buf, unsigned size)
       return;
 #endif
 
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
    debug_symbol_name_glibc(addr, buf, size);
    if(buf[0])
       return;