| 1 |
commit: 53606b94d72d7d9c9d8b9ae5285144b0b455f6d5 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 2 16:06:09 2013 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 2 16:07:50 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=53606b94 |
| 7 |
|
| 8 |
media-libs/mesa: remove debug_symbol_name_glibc() |
| 9 |
|
| 10 |
--- |
| 11 |
...elect-mesa.conf.8.0.1 => eselect-mesa.conf.8.1} | 0 |
| 12 |
media-libs/mesa/files/mesa-8.0-uclibc.patch | 36 -------------------- |
| 13 |
...mesa-9.0.1-remove-debug_symbol_name_glibc.patch | 24 +++++++++++++ |
| 14 |
media-libs/mesa/mesa-9.0.1-r99.ebuild | 4 +- |
| 15 |
4 files changed, 26 insertions(+), 38 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.0.1 b/media-libs/mesa/files/eselect-mesa.conf.8.1 |
| 18 |
similarity index 100% |
| 19 |
rename from media-libs/mesa/files/eselect-mesa.conf.8.0.1 |
| 20 |
rename to media-libs/mesa/files/eselect-mesa.conf.8.1 |
| 21 |
|
| 22 |
diff --git a/media-libs/mesa/files/mesa-8.0-uclibc.patch b/media-libs/mesa/files/mesa-8.0-uclibc.patch |
| 23 |
deleted file mode 100644 |
| 24 |
index cb86d56..0000000 |
| 25 |
--- a/media-libs/mesa/files/mesa-8.0-uclibc.patch |
| 26 |
+++ /dev/null |
| 27 |
@@ -1,36 +0,0 @@ |
| 28 |
-diff -Naur Mesa-8.0.3.orig/src/gallium/auxiliary/util/u_debug_symbol.c Mesa-8.0.3/src/gallium/auxiliary/util/u_debug_symbol.c |
| 29 |
---- Mesa-8.0.3.orig/src/gallium/auxiliary/util/u_debug_symbol.c 2011-12-07 23:54:22.000000000 +0000 |
| 30 |
-+++ Mesa-8.0.3/src/gallium/auxiliary/util/u_debug_symbol.c 2012-07-01 22:35:05.272342392 +0000 |
| 31 |
-@@ -151,7 +151,7 @@ |
| 32 |
- } |
| 33 |
- #endif |
| 34 |
- |
| 35 |
--#ifdef __GLIBC__ |
| 36 |
-+#if defined(__GLIBC__) && !defined(__UCLIBC__) |
| 37 |
- #include <execinfo.h> |
| 38 |
- |
| 39 |
- /* This can only provide dynamic symbols, or binary offsets into a file. |
| 40 |
-diff -Naur Mesa-8.0.3.orig/src/glsl/strtod.c Mesa-8.0.3/src/glsl/strtod.c |
| 41 |
---- Mesa-8.0.3.orig/src/glsl/strtod.c 2012-05-18 04:27:14.000000000 +0000 |
| 42 |
-+++ Mesa-8.0.3/src/glsl/strtod.c 2012-07-01 18:19:20.624711636 +0000 |
| 43 |
-@@ -45,7 +45,7 @@ |
| 44 |
- glsl_strtod(const char *s, char **end) |
| 45 |
- { |
| 46 |
- #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ |
| 47 |
-- !defined(__HAIKU__) |
| 48 |
-+ !defined(__HAIKU__) && !defined(__UCLIBC__) |
| 49 |
- static locale_t loc = NULL; |
| 50 |
- if (!loc) { |
| 51 |
- loc = newlocale(LC_CTYPE_MASK, "C", NULL); |
| 52 |
-diff -Naur Mesa-8.0.3.orig/src/mesa/main/imports.c Mesa-8.0.3/src/mesa/main/imports.c |
| 53 |
---- Mesa-8.0.3.orig/src/mesa/main/imports.c 2012-05-18 04:27:14.000000000 +0000 |
| 54 |
-+++ Mesa-8.0.3/src/mesa/main/imports.c 2012-07-01 20:36:48.235060134 +0000 |
| 55 |
-@@ -767,7 +767,7 @@ |
| 56 |
- _mesa_strtof( const char *s, char **end ) |
| 57 |
- { |
| 58 |
- #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ |
| 59 |
-- !defined(ANDROID) && !defined(__HAIKU__) |
| 60 |
-+ !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) |
| 61 |
- static locale_t loc = NULL; |
| 62 |
- if (!loc) { |
| 63 |
- loc = newlocale(LC_CTYPE_MASK, "C", NULL); |
| 64 |
|
| 65 |
diff --git a/media-libs/mesa/files/mesa-9.0.1-remove-debug_symbol_name_glibc.patch b/media-libs/mesa/files/mesa-9.0.1-remove-debug_symbol_name_glibc.patch |
| 66 |
new file mode 100644 |
| 67 |
index 0000000..12346bf |
| 68 |
--- /dev/null |
| 69 |
+++ b/media-libs/mesa/files/mesa-9.0.1-remove-debug_symbol_name_glibc.patch |
| 70 |
@@ -0,0 +1,24 @@ |
| 71 |
+diff -Naur Mesa-9.0.1.org/src/gallium/auxiliary/util/u_debug_symbol.c Mesa-9.0.1/src/gallium/auxiliary/util/u_debug_symbol.c |
| 72 |
+--- Mesa-9.0.1.org/src/gallium/auxiliary/util/u_debug_symbol.c 2012-08-31 19:33:41.000000000 -0400 |
| 73 |
++++ Mesa-9.0.1/src/gallium/auxiliary/util/u_debug_symbol.c 2013-01-02 10:42:33.429869685 -0500 |
| 74 |
+@@ -151,10 +151,8 @@ |
| 75 |
+ } |
| 76 |
+ #endif |
| 77 |
+ |
| 78 |
+-#ifdef __GLIBC__ |
| 79 |
+-#ifndef __UCLIBC__ |
| 80 |
++#if defined(__GLIBC__) && !defined(__UCLIBC__) |
| 81 |
+ #include <execinfo.h> |
| 82 |
+-#endif |
| 83 |
+ |
| 84 |
+ /* This can only provide dynamic symbols, or binary offsets into a file. |
| 85 |
+ * |
| 86 |
+@@ -179,7 +177,7 @@ |
| 87 |
+ return; |
| 88 |
+ #endif |
| 89 |
+ |
| 90 |
+-#ifdef __GLIBC__ |
| 91 |
++#if defined(__GLIBC__) && !defined(__UCLIBC__) |
| 92 |
+ debug_symbol_name_glibc(addr, buf, size); |
| 93 |
+ if(buf[0]) |
| 94 |
+ return; |
| 95 |
|
| 96 |
diff --git a/media-libs/mesa/mesa-9.0.1-r99.ebuild b/media-libs/mesa/mesa-9.0.1-r99.ebuild |
| 97 |
index d7d20f6..a427fae 100644 |
| 98 |
--- a/media-libs/mesa/mesa-9.0.1-r99.ebuild |
| 99 |
+++ b/media-libs/mesa/mesa-9.0.1-r99.ebuild |
| 100 |
@@ -166,8 +166,8 @@ src_prepare() { |
| 101 |
# relax the requirement that r300 must have llvm, bug 380303 |
| 102 |
epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch |
| 103 |
|
| 104 |
- # void glibc-ism on a uclibc system |
| 105 |
- epatch "${FILESDIR}"/${PN}-8.0-uclibc.patch |
| 106 |
+ # void backtrace on a uclibc system |
| 107 |
+ epatch "${FILESDIR}"/${PN}-9.0.1-remove-debug_symbol_name_glibc.patch |
| 108 |
|
| 109 |
# fix for hardened pax_kernel, bug 240956 |
| 110 |
[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |
Archives