admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: reformat default options to workaround bug in meson configure

Browse Source 
Since 13cb20fc46 ("meson: fix compilation with Visual Studio",
2025-01-22) it has not been possible to list build options via `meson
configure`. This is due to Meson's static analysis of build options
failing to handle constant folding, and thinking we set a totally
invalid default `-std=`.

This is reported upstream but we anyways need to work with existing
versions. It turns out there is a simple solution: turn the entire
default option into a conditional branch, which means Meson sees either
nothing, or everything.

As a result, Git users can once again see pretty-printed options before
building.

Reported-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Bug: https://github.com/mesonbuild/meson/issues/14623
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eli Schwartz
2025-05-19 13:09:42 -04:00
committed by Junio C Hamano
parent d50a5e8939
commit cddcee7f64
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@@ -178,14 +178,12 @@ project('git', 'c',
capture: true, capture: true,
check: true, check: true,
).stdout().strip() : 'unknown', ).stdout().strip() : 'unknown',
default_options: [
# Git requires C99 with GNU extensions, which of course isn't supported by # Git requires C99 with GNU extensions, which of course isn't supported by
# MSVC. Funny enough, C99 doesn't work with MSVC either, as it has only # MSVC. Funny enough, C99 doesn't work with MSVC either, as it has only
# learned to define __STDC_VERSION__ with C11 and later. We thus require # learned to define __STDC_VERSION__ with C11 and later. We thus require
# GNU C99 and fall back to C11. Meson only learned to handle the fallback # GNU C99 and fall back to C11. Meson only learned to handle the fallback
# with version 1.3.0, so on older versions we use GNU C99 unconditionally. # with version 1.3.0, so on older versions we use GNU C99 unconditionally.
'c_std=' + (meson.version().version_compare('>=1.3.0') ? 'gnu99,c11' : 'gnu99'), default_options: meson.version().version_compare('>=1.3.0') ? ['c_std=gnu99,c11'] : ['c_std=gnu99'],
],
) )
fs = import('fs') fs = import('fs')