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

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     7a6dee92f3d9a3164f827ab80bc46e93330c2791
Author:     layman <layman <AT> localhost>
AuthorDate: Fri Feb 21 20:32:36 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 20:32:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=7a6dee92

media-libs/mesa: use err.h instead of error.h

---
 .../mesa/files/mesa-9.1.6-remove-error_h.patch     | 33 ++++++++++++++++++++++
 media-libs/mesa/mesa-9.1.6-r99.ebuild              |  3 ++
 2 files changed, 36 insertions(+)

diff --git a/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch b/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch
new file mode 100644
index 0000000..c12d6fd
--- /dev/null
+++ b/media-libs/mesa/files/mesa-9.1.6-remove-error_h.patch
@@ -0,0 +1,33 @@
+diff -Naur Mesa-9.1.6.orig/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c Mesa-9.1.6/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
+--- Mesa-9.1.6.orig/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c	2013-07-31 22:56:45.000000000 +0000
++++ Mesa-9.1.6/src/gallium/state_trackers/xvmc/tests/xvmc_bench.c	2014-02-21 20:20:43.470217630 +0000
+@@ -28,7 +28,7 @@
+ #include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <error.h>
++#include <err.h>
+ #include <sys/time.h>
+ #include "testlib.h"
+ 
+@@ -144,9 +144,9 @@
+ 	}
+ 
+ 	if (fail)
+-		error
++		err
+ 		(
+-			1, 0,
++			1,
+ 			"Bad argument.\n"
+ 			"\n"
+ 			"Usage: %s [options]\n"
+@@ -214,7 +214,7 @@
+ 	))
+ 	{
+ 		XCloseDisplay(display);
+-		error(1, 0, "Error, unable to find a good port.\n");
++		err(1, "Error, unable to find a good port.\n");
+ 	}
+ 
+ 	if (is_overlay)

diff --git a/media-libs/mesa/mesa-9.1.6-r99.ebuild b/media-libs/mesa/mesa-9.1.6-r99.ebuild
index 6a70d16..f1c69d3 100644
--- a/media-libs/mesa/mesa-9.1.6-r99.ebuild
+++ b/media-libs/mesa/mesa-9.1.6-r99.ebuild
@@ -161,6 +161,9 @@ src_prepare() {
 		epatch
 	fi
 
+	# musl doesn have error, so we fall back on err.
+	epatch "${FILESDIR}"/${PN}-9.1.6-remove-error_h.patch
+
 	# relax the requirement that r300 must have llvm, bug 380303
 	epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch