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

build: Define GLIB_USING_SYSTEM_PRINTF properly

Browse Source 
Previously it was hard-coded to true, rather than being based on the
calculations actually made by meson.build.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://gitlab.gnome.org/GNOME/glib/issues/1313
This commit is contained in:
Philip Withnall 2018-08-29 11:58:51 +01:00
parent f35c4d5d42
commit 7bc3edd1e5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -894,6 +894,9 @@ else
glib_conf.set('HAVE_VASPRINTF', 1) glib_conf.set('HAVE_VASPRINTF', 1)
endif endif
glibconfig_conf.set('GLIB_USING_SYSTEM_PRINTF',
have_good_vsnprintf and have_good_snprintf and have_good_printf)
# Check whether the printf() family supports Unix98 %n$ positional parameters # Check whether the printf() family supports Unix98 %n$ positional parameters
# AC_FUNC_PRINTF_UNIX98 # AC_FUNC_PRINTF_UNIX98
# Nothing uses HAVE_UNIX98_PRINTF # Nothing uses HAVE_UNIX98_PRINTF
@ -1522,8 +1525,6 @@ foreach d : inet_defines
glibconfig_conf.set(d[1], val) glibconfig_conf.set(d[1], val)
endforeach endforeach
glibconfig_conf.set('GLIB_USING_SYSTEM_PRINTF', true) # FIXME!
# We need a more robust approach here... # We need a more robust approach here...
host_cpu_family = host_machine.cpu_family() host_cpu_family = host_machine.cpu_family()
if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax') if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')