From c5d0dc7fa5566941a49ede8c83a0cfe0a33a3d7f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 5 Jul 2017 14:16:11 -0700 Subject: [PATCH] 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 ^~~~~~~~~~~ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101657 Signed-off-by: Vinson Lee Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Emil Velikov Reviewed-by: Eric Engestrom Tested-by: Eric Engestrom --- scons/gallium.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 += [ -- 2.11.0