diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2017-07-05 14:16:11 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2017-07-06 09:51:28 -0700 |
| commit | c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f (patch) | |
| tree | eff9d3a88e948762e5d3d134f7926a9bff94f718 /scons | |
| parent | a6c2001ace8ddf56b3781bc0bbf181173b8f393b (diff) | |
| download | mesa-c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f.tar.gz mesa-c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f.tar.bz2 mesa-c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f.zip | |
scons: Check for xlocale.h before defining HAVE_XLOCALE_H.
Don't assume the header is present on some platforms - use the more
robust CheckHeader() instead.
glibc 2.26 removed xlocale.h.
https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
Fix this build error with glibc 2.26.
Compiling src/util/strtod.c ...
src/util/strtod.c:32:10: fatal error: xlocale.h: No such file or directory
#include <xlocale.h>
^~~~~~~~~~~
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101657
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Tested-by: Eric Engestrom <eric.engestrom@imgtec.com>
Diffstat (limited to 'scons')
| -rwxr-xr-x | scons/gallium.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index a4112773241..61643a6d4fc 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -325,8 +325,10 @@ def generate(env): 'GLX_INDIRECT_RENDERING', ] - if env['platform'] in ('linux', 'darwin'): + conf = SCons.Script.Configure(env) + if conf.CheckHeader('xlocale.h'): cppdefines += ['HAVE_XLOCALE_H'] + env = conf.Finish() if platform == 'windows': cppdefines += [ |