Patchwork [16/16] mesa-xlib: Dont use locales with uclibc

login
register
mail settings
Submitter Khem Raj
Date July 19, 2011, 12:17 a.m.
Message ID <b59388af2f59c27354950b98ab4588836f1768ec.1311034342.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/7797/
State New, archived
Headers show

Comments

Khem Raj - July 19, 2011, 12:17 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../mesa/mesa-xlib/uclibc_locale.patch             |   18 ++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb     |    3 ++-
 2 files changed, 20 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-xlib/uclibc_locale.patch

Patch

diff --git a/meta/recipes-graphics/mesa/mesa-xlib/uclibc_locale.patch b/meta/recipes-graphics/mesa/mesa-xlib/uclibc_locale.patch
new file mode 100644
index 0000000..6615895
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib/uclibc_locale.patch
@@ -0,0 +1,18 @@ 
+We disable locale on uclibc in OE therefore we do not use it if building for uclibc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate <OE config related>
+
+Index: Mesa-7.10.2/src/glsl/strtod.c
+===================================================================
+--- Mesa-7.10.2.orig/src/glsl/strtod.c	2011-01-03 16:45:51.000000000 -0800
++++ Mesa-7.10.2/src/glsl/strtod.c	2011-07-16 18:18:15.693831691 -0700
+@@ -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/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
index b77df2c..848c072 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
@@ -1,6 +1,7 @@ 
 include mesa-common.inc
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           file://uclibc_locale.patch \
            "
 
 SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
@@ -14,6 +15,6 @@  LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-driver=xlib"