[gentoo-commits] proj/hardened-dev:uclibc commit in: media-libs/mesa/, media-libs/mesa/files/

[Anthony G. Basile]

commit:     7a4871deff8ea91706852dfb7aedcf43eec25ce1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 21:11:53 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 21:11:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7a4871de

media-libs/mesa: patch C files where build system's MACROS don't work

---
 .../mesa/files/remove-GNU_SOURCE-locale.patch      |   65 ++++++++++++++++++++
 media-libs/mesa/mesa-7.11.2-r99.ebuild             |    3 +-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/files/remove-GNU_SOURCE-locale.patch b/media-libs/mesa/files/remove-GNU_SOURCE-locale.patch
new file mode 100644
index 0000000..f197b11
--- /dev/null
+++ b/media-libs/mesa/files/remove-GNU_SOURCE-locale.patch
@@ -0,0 +1,65 @@
+diff -Naur Mesa-7.11.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c Mesa-7.11.2/src/gallium/auxiliary/util/u_debug_symbol.c
+--- Mesa-7.11.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2011-07-09 01:32:30.000000000 +0000
++++ Mesa-7.11.2/src/gallium/auxiliary/util/u_debug_symbol.c	2012-01-06 20:45:51.822428420 +0000
+@@ -151,23 +151,6 @@
+ }
+ #endif
+ 
+-#ifdef __GLIBC__
+-#include <execinfo.h>
+-
+-/* This can only provide dynamic symbols, or binary offsets into a file.
+- *
+- * To fix this, post-process the output with tools/addr2line.sh
+- */
+-static INLINE void
+-debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
+-{
+-   char** syms = backtrace_symbols((void**)&addr, 1);
+-   strncpy(buf, syms[0], size);
+-   buf[size - 1] = 0;
+-   free(syms);
+-}
+-#endif
+-
+ void
+ debug_symbol_name(const void *addr, char* buf, unsigned size)
+ {
+diff -Naur Mesa-7.11.2.orig/src/glsl/strtod.c Mesa-7.11.2/src/glsl/strtod.c
+--- Mesa-7.11.2.orig/src/glsl/strtod.c	2012-01-06 20:45:34.282662359 +0000
++++ Mesa-7.11.2/src/glsl/strtod.c	2012-01-06 20:42:11.303216873 +0000
+@@ -44,13 +44,5 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtod_l(s, end, loc);
+-#else
+    return strtod(s, end);
+-#endif
+ }
+diff -Naur Mesa-7.11.2.orig/src/mesa/main/imports.c Mesa-7.11.2/src/mesa/main/imports.c
+--- Mesa-7.11.2.orig/src/mesa/main/imports.c	2012-01-06 20:45:34.283662859 +0000
++++ Mesa-7.11.2/src/mesa/main/imports.c	2012-01-06 20:42:11.305217873 +0000
+@@ -753,17 +753,7 @@
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+-#else
+-   return (float)strtod(s, end);
+-#endif
+ }
+ 
+ /** Compute simple checksum/hash for a string */

diff --git a/media-libs/mesa/mesa-7.11.2-r99.ebuild b/media-libs/mesa/mesa-7.11.2-r99.ebuild
index 6acfe89..98154da 100644
--- a/media-libs/mesa/mesa-7.11.2-r99.ebuild
+++ b/media-libs/mesa/mesa-7.11.2-r99.ebuild
@@ -97,8 +97,6 @@ S="${WORKDIR}/${MY_P}"
 QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
 QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
 
-# Think about: ggi, fbcon, no-X configs
-
 pkg_setup() {
 	# recommended by upstream
 	append-flags -ffast-math
@@ -126,6 +124,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
 	epatch "${FILESDIR}"/respect-user-defines.patch
+	epatch "${FILESDIR}"/remove-GNU_SOURCE-locale.patch
 
 	base_src_prepare