[oe-commits] Khem Raj : mesa-7.9.1: Fix build on uclibc

[git version control]

Module: openembedded.git
Branch: master
Commit: f2253e23c7fbbf2bfa1a0d1b47342800755e71c6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f2253e23c7fbbf2bfa1a0d1b47342800755e71c6

Author: Khem Raj <raj.khem at gmail.com>
Date:   Mon Jan 10 21:42:29 2011 -0800

mesa-7.9.1: Fix build on uclibc

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/mesa/mesa-7.9.1/uclibc.patch |   21 +++++++++++++++++----
 recipes/mesa/mesa-dri_7.9.1.bb       |    2 +-
 recipes/mesa/mesa_7.9.1.bb           |    2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/recipes/mesa/mesa-7.9.1/uclibc.patch b/recipes/mesa/mesa-7.9.1/uclibc.patch
index 11cfe2d..0508112 100644
--- a/recipes/mesa/mesa-7.9.1/uclibc.patch
+++ b/recipes/mesa/mesa-7.9.1/uclibc.patch
@@ -1,8 +1,8 @@
-Index: Mesa-7.9/src/mesa/main/imports.c
+Index: Mesa-7.9.1/src/mesa/main/imports.c
 ===================================================================
---- Mesa-7.9.orig/src/mesa/main/imports.c
-+++ Mesa-7.9/src/mesa/main/imports.c
-@@ -756,7 +756,7 @@ _mesa_strdup( const char *s )
+--- Mesa-7.9.1.orig/src/mesa/main/imports.c	2010-12-15 13:50:00.000000000 -0800
++++ Mesa-7.9.1/src/mesa/main/imports.c	2011-01-10 12:23:48.848656001 -0800
+@@ -757,7 +757,7 @@
  float
  _mesa_strtof( const char *s, char **end )
  {
@@ -11,3 +11,16 @@ Index: Mesa-7.9/src/mesa/main/imports.c
     static locale_t loc = NULL;
     if (!loc) {
        loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+Index: Mesa-7.9.1/src/glsl/strtod.c
+===================================================================
+--- Mesa-7.9.1.orig/src/glsl/strtod.c	2011-01-10 20:08:01.568656001 -0800
++++ Mesa-7.9.1/src/glsl/strtod.c	2011-01-10 20:08:39.898656001 -0800
+@@ -44,7 +44,7 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(__UCLIBC__)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/recipes/mesa/mesa-dri_7.9.1.bb b/recipes/mesa/mesa-dri_7.9.1.bb
index 26b56e4..bd62c98 100644
--- a/recipes/mesa/mesa-dri_7.9.1.bb
+++ b/recipes/mesa/mesa-dri_7.9.1.bb
@@ -1,4 +1,4 @@
 require mesa-common.inc
 require mesa-${PV}.inc
 require mesa-dri.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
diff --git a/recipes/mesa/mesa_7.9.1.bb b/recipes/mesa/mesa_7.9.1.bb
index 4cb8db7..f5c9a17 100644
--- a/recipes/mesa/mesa_7.9.1.bb
+++ b/recipes/mesa/mesa_7.9.1.bb
@@ -1,6 +1,6 @@
 # This is a dummy package so OE can use the poky mesa files
 require mesa-dri_${PV}.bb
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 EXTRA_OECONF += "--disable-egl"