luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: Fix gnulib build where isnan*() is needed

Browse Source 
We need to include the isnan*.c sources as necessary, if any of the
isnan*() functions cannot be found, so that builds on compilers that
lack these functions could be fixed.

Also, if we do have the isnan*() functions, improve the build by not
unnecessarily including the isnan*.c sources in the build.

If the isnan*() functions are found, make sure that the
HAVE_ISNAN*_IN_LIBC macros are defined in the CFLags, so that we do not
accidently require the gnulib implementations for these functions.
This commit is contained in:
Chun-wei Fan 2020-06-09 17:08:33 +08:00
parent 1cd7d1ade2
commit 9b59c79e98
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/gnulib/meson.build
View File

@ -191,29 +191,47 @@ nan_tmpl = '''#include <math.h>
int main () {return @0@ (x);} int main () {return @0@ (x);}
''' '''
links = cc.links (nan_tmpl.format ('isnan', 'double', '__builtin_isnan'), links = cc.links (nan_tmpl.format ('isnand', 'double', '__builtin_isnan'),
dependencies : [libm]) dependencies : [libm])
math_h_config.set ('HAVE_ISNAN', links ? 1 : 0) math_h_config.set ('HAVE_ISNAN', links ? 1 : 0)
math_h_config.set ('HAVE_ISNAN_IN_LIBC', links ? 1 : 0)
set_variable ('have_isnan', links) set_variable ('have_isnan', links)
math_h_config.set ('HAVE_ISNAND', links ? 1 : 0) math_h_config.set ('HAVE_ISNAND', links ? 1 : 0)
math_h_config.set ('HAVE_ISNAND_IN_LIBC', links ? 1 : 0)
set_variable ('have_isnand', links) set_variable ('have_isnand', links)
if links
extra_gnulib_args += '-DHAVE_ISNAN_IN_LIBC'
extra_gnulib_args += '-DHAVE_ISNAND_IN_LIBC'
endif
links = cc.links (nan_tmpl.format ('isnanf', 'float', '__builtin_isnanf'), links = cc.links (nan_tmpl.format ('isnanf', 'float', '__builtin_isnanf'),
dependencies : [libm]) dependencies : [libm])
math_h_config.set ('HAVE_ISNANF', links ? 1 : 0) math_h_config.set ('HAVE_ISNANF', links ? 1 : 0)
math_h_config.set ('HAVE_ISNANF_IN_LIBC', links ? 1 : 0)
set_variable ('have_isnanf', links) set_variable ('have_isnanf', links)
if links
extra_gnulib_args += '-DHAVE_ISNANF_IN_LIBC'
endif
links = cc.links (nan_tmpl.format ('isnanl', 'long double', '__builtin_isnanl'), links = cc.links (nan_tmpl.format ('isnanl', 'long double', '__builtin_isnanl'),
dependencies : [libm]) dependencies : [libm])
math_h_config.set ('HAVE_ISNANL', links ? 1 : 0) math_h_config.set ('HAVE_ISNANL', links ? 1 : 0)
math_h_config.set ('HAVE_ISNANL_IN_LIBC', links ? 1 : 0)
set_variable ('have_isnanl', links) set_variable ('have_isnanl', links)
if links
extra_gnulib_args += '-DHAVE_ISNANL_IN_LIBC'
endif
math_h_config.set ('REPLACE_ISNAN', (have_isnand and have_isnanf and have_isnanl) ? 0 : 1) math_h_config.set ('REPLACE_ISNAN', (have_isnand and have_isnanf and have_isnanl) ? 0 : 1)
other_needed_math_sources = []
if not (have_isnand and have_isnanf and have_isnanl)
other_needed_math_sources += [ 'isnand.c', 'isnanf.c', 'isnanl.c' ]
endif
links = cc.links ('''#include <math.h> links = cc.links ('''#include <math.h>
double x; double x;
int y; int y;
@ -312,7 +330,6 @@ inf_tmpl = '''#include <math.h>
int main () {return @0@ (x);} int main () {return @0@ (x);}
''' '''
other_needed_math_sources = []
# Some compilers may not have isfinite, isinf available # Some compilers may not have isfinite, isinf available
foreach f: ['isfinite', 'isinf', 'signbit'] foreach f: ['isfinite', 'isinf', 'signbit']
links = cc.links (inf_tmpl.format('@0@'.format(f)), links = cc.links (inf_tmpl.format('@0@'.format(f)),
@ -334,7 +351,7 @@ math_h = configure_file (input: 'gnulib_math.h.in',
output: 'gnulib_math.h', output: 'gnulib_math.h',
configuration: math_h_config) configuration: math_h_config)
gnulib_sources = ['asnprintf.c', 'printf.c', 'printf-args.c', 'printf-parse.c', 'printf-frexp.c', 'printf-frexpl.c', 'isnand.c', 'isnanl.c', 'vasnprintf.c', 'xsize.c'] gnulib_sources = ['asnprintf.c', 'printf.c', 'printf-args.c', 'printf-parse.c', 'printf-frexp.c', 'printf-frexpl.c', 'vasnprintf.c', 'xsize.c']
if not gl_cv_func_frexp_works if not gl_cv_func_frexp_works
gnulib_sources += ['frexp.c'] gnulib_sources += ['frexp.c']