Fix compile time errors when building against uclibc

Mesa misses a few checks when compiling on a uclibc system
which cause it to fall back on glibc-ism.  This patch
addresses those issues.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
index bae9be87a26df06af274f30e7974a7da2eca3120..3d2f8ebc31ba25b8f9747cc0254a353d501bcad8 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_symbol.c
+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
@@ -152,7 +152,9 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size)
 #endif
 
 #ifdef __GLIBC__
+#ifndef __UCLIBC__
 #include <execinfo.h>
+#endif
 
 /* This can only provide dynamic symbols, or binary offsets into a file.
  *

diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
index a876e138b70460a5bec2f8082dd06df0cac006c8..47c1f0ed69c880b2fbd62d445fdf511a43cda752 100644 (file)
--- a/src/glsl/strtod.c
+++ b/src/glsl/strtod.c
@@ -45,7 +45,7 @@ double
 glsl_strtod(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
-   !defined(__HAIKU__)
+   !defined(__HAIKU__) && !defined(__UCLIBC__)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 444de875cf7566ec50cfe17cbcbf0c6400fa117e..0d6b56a518a1c31583368c1190a8c0e17d79d804 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -542,7 +542,7 @@ float
 _mesa_strtof( const char *s, char **end )
 {
 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
-   !defined(ANDROID) && !defined(__HAIKU__)
+   !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);