@matheusbsbs / matheus-bagliano / commits / 7208d84305

meson: define WITH_BREAKING_CHANGES when enabling breaking changes

While Meson already supports the `-Dbreaking_changes=true` option, it only wires up the build option that propagates into the tests. The build option is only used for our tests to enable the `WITH_BREAKING_CHANGES` prerequisite though, and does not influence the code that is actually being built. The omission went unnoticed because we only have tests right now that get disabled when breaking changes are enabled, but not the other way round. In other words, we don't have any tests that verify that breaking changes behave as expected. Fix the build issue by setting the `WITH_BREAKING_CHANGES` preprocessor macro when breaking changes are enabled. Note that the `libgit_c_args` array is defined after the current spot where we handle the option, so to not have multiple sites where we handle it we instead move it after the array has been defined. Based-on-patch-by: Phillip Wood <phillip.wood123@gmail.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Mar 12, 2025 at 14:17 UTC 7208d84305254a882eb93449eee0591875814f1b
1 file changed +7 -6
meson.build
+7 -6
@@ -672,12 +672,6 @@ build_options_config.set_quoted('GIT_TEST_UTF8_LOCALE', get_option('test_utf8_lo
672 build_options_config.set_quoted('LOCALEDIR', fs.as_posix(get_option('prefix') / get_option('localedir')))
673 build_options_config.set('GITWEBDIR', fs.as_posix(get_option('prefix') / get_option('datadir') / 'gitweb'))
674
675 -if get_option('breaking_changes')
676 - build_options_config.set('WITH_BREAKING_CHANGES', 'YesPlease')
677 -else
678 - build_options_config.set('WITH_BREAKING_CHANGES', '')
679 -endif
680 -
675 if get_option('sane_tool_path').length() != 0
676 sane_tool_path = (host_machine.system() == 'windows' ? ';' : ':').join(get_option('sane_tool_path'))
677 build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + sane_tool_path + '"|')
@@ -739,6 +733,13 @@ if get_option('warning_level') in ['2','3', 'everything'] and compiler.get_argum
733 endforeach
734 endif
735
736 +if get_option('breaking_changes')
737 + build_options_config.set('WITH_BREAKING_CHANGES', 'YesPlease')
738 + libgit_c_args += '-DWITH_BREAKING_CHANGES'
739 +else
740 + build_options_config.set('WITH_BREAKING_CHANGES', '')
741 +endif
742 +
743 if get_option('b_sanitize').contains('address')
744 build_options_config.set('SANITIZE_ADDRESS', 'YesCompiledWithIt')
745 else