summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-08-31 16:55:56 +0000
committerAndres Gomez <[email protected]>2017-09-06 18:05:10 +0300
commit80dcb7d4fdf86c0e90b53bfe60afb0106bfd703d (patch)
tree7b2625721b2088ba5a6d61ef73a92196a05f52d7 /scons
parenteb5eb5b26d3dffdbfac9c12a9113a16859a7f0c0 (diff)
util: improve compiler guard
Glibc 2.26 has dropped xlocale.h, but the functions needed (strtod_l() and strdof_l()) can be found in stdlib.h. Improve the detection method to allow newer builds to still make use of the locale-setting. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102454 Cc: Laurent Carlier <[email protected]> Cc: Emil Velikov <[email protected]> Cc: Rob Herring <[email protected]> Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Laurent Carlier <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> (cherry picked from commit 49b428470e28ae6ab22083e43fa41abf622f3b0d)
Diffstat (limited to 'scons')
-rwxr-xr-xscons/gallium.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 61643a6d4fc..450da8cc6ef 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -146,6 +146,19 @@ def check_cc(env, cc, expr, cpp_opt = '-E'):
return result
+def check_functions(env, functions):
+ '''Check if all of the functions exist'''
+
+ conf = SCons.Script.Configure(env)
+ have_functions = True
+
+ for function in functions:
+ if not conf.CheckFunc(function):
+ have_functions = False
+
+ env = conf.Finish()
+ return have_functions
+
def check_prog(env, prog):
"""Check whether this program exists."""
@@ -330,6 +343,9 @@ def generate(env):
cppdefines += ['HAVE_XLOCALE_H']
env = conf.Finish()
+ if check_functions(env, ['strtod_l', 'strtof_l']):
+ cppdefines += ['HAVE_STRTOD_L']
+
if platform == 'windows':
cppdefines += [
'WIN32',