From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RjH5P-00028v-Rk for garchives@archives.gentoo.org; Fri, 06 Jan 2012 21:12:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD55521C190; Fri, 6 Jan 2012 21:12:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6EF3621C190 for ; Fri, 6 Jan 2012 21:12:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF9061B4098 for ; Fri, 6 Jan 2012 21:11:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F258480042 for ; Fri, 6 Jan 2012 21:11:58 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <7a4871deff8ea91706852dfb7aedcf43eec25ce1.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: media-libs/mesa/, media-libs/mesa/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: media-libs/mesa/files/remove-GNU_SOURCE-locale.patch media-libs/mesa/mesa-7.11.2-r99.ebuild X-VCS-Directories: media-libs/mesa/ media-libs/mesa/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7a4871deff8ea91706852dfb7aedcf43eec25ce1 Date: Fri, 6 Jan 2012 21:11:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7e6db4a3-0043-45c6-a754-8f2620e341bf X-Archives-Hash: 8330cd061f345ee62e403e9dc7cd7634 commit: 7a4871deff8ea91706852dfb7aedcf43eec25ce1 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Jan 6 21:11:53 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Jan 6 21:11:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3D7a4871de 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 2= 0:45:51.822428420 +0000 +@@ -151,23 +151,6 @@ + } + #endif +=20 +-#ifdef __GLIBC__ +-#include +- +-/* 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 =3D backtrace_symbols((void**)&addr, 1); +- strncpy(buf, syms[0], size); +- buf[size - 1] =3D 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/strto= d.c +--- Mesa-7.11.2.orig/src/glsl/strtod.c 2012-01-06 20:45:34.282662359 +00= 00 ++++ 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 =3D NULL; +- if (!loc) { +- loc =3D 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.2836628= 59 +0000 ++++ Mesa-7.11.2/src/mesa/main/imports.c 2012-01-06 20:42:11.305217873 +0= 000 +@@ -753,17 +753,7 @@ + float + _mesa_strtof( const char *s, char **end ) + { +-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD_= _) +- static locale_t loc =3D NULL; +- if (!loc) { +- loc =3D newlocale(LC_CTYPE_MASK, "C", NULL); +- } +- return strtof_l(s, end, loc); +-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOUR= CE >=3D 600) + return strtof(s, end); +-#else +- return (float)strtod(s, end); +-#endif + } +=20 + /** Compute simple checksum/hash for a string */ diff --git a/media-libs/mesa/mesa-7.11.2-r99.ebuild b/media-libs/mesa/mes= a-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=3D"${WORKDIR}/${MY_P}" QA_EXECSTACK=3D"usr/lib*/opengl/xorg-x11/lib/libGL.so*" QA_WX_LOAD=3D"usr/lib*/opengl/xorg-x11/lib/libGL.so*" =20 -# 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 =20 epatch "${FILESDIR}"/respect-user-defines.patch + epatch "${FILESDIR}"/remove-GNU_SOURCE-locale.patch =20 base_src_prepare =20