summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa-git
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-13 10:48:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:11 +0100
commit303df74a95aee01eac2cc942fee6e6a755a99b24 (patch)
tree4561f4b9e28e28b88490dcffd2e92ef1a5c9dff5 /meta/recipes-graphics/mesa/mesa-git
parentd7761be8ab9c19f75731e6fbbade22b3643d048e (diff)
downloadpoky-303df74a95aee01eac2cc942fee6e6a755a99b24.tar.gz
mesa-git: upgrade from 7.7+git to 7.11+git
* progs package is also gone like in 7.11 (moved to separate recipe) * uclibc.patch was updated a bit to apply again (From OE-Core rev: 3b37ed1ff769bac53777c037b624338691861aac) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-git')
-rw-r--r--meta/recipes-graphics/mesa/mesa-git/uclibc.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-git/uclibc.patch b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
new file mode 100644
index 0000000000..0b031f9c35
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-git/uclibc.patch
@@ -0,0 +1,57 @@
1Upstream-Status: Pending
2
3From 904bd5127bd88f45abf4a376676e0a487cfb018a Mon Sep 17 00:00:00 2001
4From: Martin Jansa <Martin.Jansa@gmail.com>
5Date: Thu, 13 Oct 2011 12:46:53 +0200
6Subject: [PATCH] configure: add check HAVE_NEWLOCALE to fix build with uclibc
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 configure.ac | 3 +++
11 src/glsl/strtod.c | 2 +-
12 src/mesa/main/imports.c | 2 +-
13 3 files changed, 5 insertions(+), 2 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 49e81ad..468cfd7 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -507,6 +507,9 @@ AC_SUBST([DLOPEN_LIBS])
20 dnl See if posix_memalign is available
21 AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
22
23+dnl See if newlocale is available
24+AC_CHECK_FUNCS_ONCE(newlocale)
25+
26 dnl SELinux awareness.
27 AC_ARG_ENABLE([selinux],
28 [AS_HELP_STRING([--enable-selinux],
29diff --git a/src/glsl/strtod.c b/src/glsl/strtod.c
30index ff34591..88aa5ef 100644
31--- a/src/glsl/strtod.c
32+++ b/src/glsl/strtod.c
33@@ -44,7 +44,7 @@
34 double
35 glsl_strtod(const char *s, char **end)
36 {
37-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
38+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
39 static locale_t loc = NULL;
40 if (!loc) {
41 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
42diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
43index 345a1c5..493e0fb 100644
44--- a/src/mesa/main/imports.c
45+++ b/src/mesa/main/imports.c
46@@ -767,7 +767,7 @@ float
47 _mesa_strtof( const char *s, char **end )
48 {
49 #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
50- !defined(ANDROID)
51+ !defined(ANDROID) && defined (HAVE_NEWLOCALE)
52 static locale_t loc = NULL;
53 if (!loc) {
54 loc = newlocale(LC_CTYPE_MASK, "C", NULL);
55--
561.7.7
57