[oe-commits] Martin Jansa : mesa-7.9: add patch from Khem Raj for successful build with uclibc

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Dec 20 12:52:18 2010 +0100

mesa-7.9: add patch from Khem Raj for successful build with uclibc

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/mesa/mesa-7.9.inc          |    1 +
 recipes/mesa/mesa-7.9/uclibc.patch |   13 +++++++++++++
 recipes/mesa/mesa-dri_7.9.bb       |    2 +-
 recipes/mesa/mesa-xlib_7.9.bb      |    2 +-
 recipes/mesa/mesa_7.9.bb           |    2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes/mesa/mesa-7.9.inc b/recipes/mesa/mesa-7.9.inc
index 1dbfa85..96e2a36 100644
--- a/recipes/mesa/mesa-7.9.inc
+++ b/recipes/mesa/mesa-7.9.inc
@@ -1,5 +1,6 @@
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=archive \
            file://glamo.patch \
+           file://uclibc.patch \
           "
 
 DEPENDS += "talloc"
diff --git a/recipes/mesa/mesa-7.9/uclibc.patch b/recipes/mesa/mesa-7.9/uclibc.patch
new file mode 100644
index 0000000..11cfe2d
--- /dev/null
+++ b/recipes/mesa/mesa-7.9/uclibc.patch
@@ -0,0 +1,13 @@
+Index: Mesa-7.9/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 )
+ float
+ _mesa_strtof( 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.bb b/recipes/mesa/mesa-dri_7.9.bb
index bd62c98..fb35676 100644
--- a/recipes/mesa/mesa-dri_7.9.bb
+++ b/recipes/mesa/mesa-dri_7.9.bb
@@ -1,4 +1,4 @@
 require mesa-common.inc
 require mesa-${PV}.inc
 require mesa-dri.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
diff --git a/recipes/mesa/mesa-xlib_7.9.bb b/recipes/mesa/mesa-xlib_7.9.bb
index 93bb8cd..bed580c 100644
--- a/recipes/mesa/mesa-xlib_7.9.bb
+++ b/recipes/mesa/mesa-xlib_7.9.bb
@@ -1,4 +1,4 @@
 require mesa-common.inc
 require mesa-${PV}.inc
 require mesa-xlib.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
diff --git a/recipes/mesa/mesa_7.9.bb b/recipes/mesa/mesa_7.9.bb
index 4cb8db7..f5c9a17 100644
--- a/recipes/mesa/mesa_7.9.bb
+++ b/recipes/mesa/mesa_7.9.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"