43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
Upstream-Status: Pending
|
|
|
|
Index: Mesa-7.10.2/src/mesa/main/imports.c
|
|
===================================================================
|
|
--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.000000000 -0800
|
|
+++ Mesa-7.10.2/src/mesa/main/imports.c 2011-07-20 19:08:49.441785510 -0700
|
|
@@ -757,7 +757,7 @@
|
|
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 (HAVE_NEWLOCALE)
|
|
static locale_t loc = NULL;
|
|
if (!loc) {
|
|
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
|
|
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-20 19:10:21.441785488 -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 (HAVE_NEWLOCALE)
|
|
static locale_t loc = NULL;
|
|
if (!loc) {
|
|
loc = newlocale(LC_CTYPE_MASK, "C", NULL);
|
|
Index: Mesa-7.10.2/configure.ac
|
|
===================================================================
|
|
--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.000000000 -0700
|
|
+++ Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700
|
|
@@ -450,6 +450,9 @@
|
|
dnl See if posix_memalign is available
|
|
AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
|
|
|
|
+dnl See if newlocale is available
|
|
+AC_CHECK_FUNCS_ONCE(newlocale)
|
|
+
|
|
dnl SELinux awareness.
|
|
AC_ARG_ENABLE([selinux],
|
|
[AS_HELP_STRING([--enable-selinux],
|