Changes in v2: Patch #3 is the only one changed (as a result of Patrick's review [0]): - add some blank lines to make the option handling blocks easier to see. - add a comment to 'gitconfig' and 'gitattributes' options to indicate the default values. Note: The indicated defaults for the 'gitconfig' and 'gitattributes' are only valid when the 'prefix' option is defaulted (or not /usr). Indicating the 'correct' value when -Dprefix=/usr in the comment would consume too much space. Is this acceptable, or is it too confusing/misleading? Also, thanks to Eli for testing patch #5 on Solaris and confirming that it fixes the regression [1]. Note that I did a test merge to master@38af977b81 without issue and to next@889b7c5bd8 and seen@d8088176ab. The conflict which showed up in v1 against the 'seen' branch now appears in 'next' and has the same resolution as v1. A range-diff against v1 is given below. [0] https://lore.kernel.org/git/aB3CDOljn9zJsVwt@xxxxxx/ [1] https://lore.kernel.org/git/9baad29d-a5bf-443d-98a1-36d7020e5835@xxxxxxxxxx/ v1 cover letter follows: This series (part 2) continues the miscellaneous changes to the make, meson and autoconf build systems. I am sending this part a little earlier than I expected, so there will now be a part 3! The reason for the early posting is to try and avoid an regression in the autoconf build system (see patch #5). Hopefully, we still have time in this cycle to get patch #5 included. This series is based on commit 6f84262c44 ("The eleventh batch", 2025-05-05) I did a test merge to 'next'@629a3ecd64 without issue, but 'seen'@71cfd25022 had a small conflict with commit 1a2929c851 ("meson: allow customize perl installation path", 2025-04-24) on the 'dd/meson-perl-custom-path' branch. (I note that a new version of that patch was posted to the list today). The fixup looks like: diff --cc perl/Git/SVN/Memoize/meson.build index 4c589b30c3,8c2e80d2d2..d6209dc3bf --- a/perl/Git/SVN/Memoize/meson.build +++ b/perl/Git/SVN/Memoize/meson.build @@@ -3,6 -3,6 +3,6 @@@ test_dependencies += custom_target output: 'YAML.pm', command: generate_perl_command, install: true, - install_dir: perllibdir / 'Git/SVN', - install_dir: get_option('datadir') / 'perl5/Git/SVN/Memoize', ++ install_dir: perllibdir / 'Git/SVN/Memoize', depends: [git_version_file], ) ATB, Ramsay Jones Ramsay Jones (5): meson.build: quote the GITWEBDIR build configuration meson: correct install location of YAML.pm meson: correct path to system config/attribute files meson.build: correct setting of GIT_EXEC_PATH configure.ac: upgrade to a compilation check for sysinfo configure.ac | 25 ++++++++++++++++++++++--- meson.build | 30 +++++++++++++++++++++++++----- meson_options.txt | 4 ++-- perl/Git/SVN/Memoize/meson.build | 2 +- 4 files changed, 50 insertions(+), 11 deletions(-) range-diff against v1: 1: d5847ef791 = 1: 1f3d34eafd meson.build: quote the GITWEBDIR build configuration 2: 49e2ec6fd2 = 2: 1b7751914a meson: correct install location of YAML.pm 3: fece809f11 ! 3: a385bbed83 meson: correct path to system config/attribute files @@ meson.build: libgit_c_args = [ +else + libgit_c_args += '-DETC_GITATTRIBUTES="' + get_option('sysconfdir') + '/gitattributes"' +endif ++ +system_config = get_option('gitconfig') +if system_config != '' + libgit_c_args += '-DETC_GITCONFIG="' + system_config + '"' +else + libgit_c_args += '-DETC_GITCONFIG="' + get_option('sysconfdir') + '/gitconfig"' +endif ++ editor_opt = get_option('default_editor') if editor_opt != '' and editor_opt != 'vi' libgit_c_args += '-DDEFAULT_EDITOR="' + editor_opt + '"' @@ meson_options.txt: option('default_pager', type: 'string', value: 'less', option('default_editor', type: 'string', value: 'vi', description: 'Fall-back editor.') -option('gitconfig', type: 'string', value: '/etc/gitconfig', -+option('gitconfig', type: 'string', ++option('gitconfig', type: 'string', # default 'etc/gitconfig' description: 'Path to the global git configuration file.') -option('gitattributes', type: 'string', value: '/etc/gitattributes', -+option('gitattributes', type: 'string', ++option('gitattributes', type: 'string', # default 'etc/gitattributes' description: 'Path to the global git attributes file.') option('pager_environment', type: 'string', value: 'LESS=FRX LV=-c', description: 'Environment used when spawning the pager') 4: d49afaedf3 = 4: 0d00951475 meson.build: correct setting of GIT_EXEC_PATH 5: 69848e557f = 5: 150e4110d2 configure.ac: upgrade to a compilation check for sysinfo -- 2.49.0
