@matheusbsbs / matheus-bagliano / commits / 42846efc3b

meson: improve handling of `sane_tool_path` option

The `sane_tool_path` option can be used to override the PATH variable from which the build process, tests and ultimately Git will end up picking programs from. It is currently lacking though because we only use it to populate the PATH environment variable for executed scripts and for the `BROKEN_PATH_FIX` mechanism, but we don't use it to find programs used in the build process itself. Fix this issue by treating it similar to the Windows-specific paths, which will make us use it both to find programs and to populate the PATH environment variable. To help with this fix, change the type of the option to be an array of paths, which makes the handling a bit easier for us. It's also the correct thing to do as the input indeed is a list of paths. Furthermore, the option now overrides the default behaviour on Windows, which si to pick up tools from Git for Windows. This is done so that it becomes easier to override that default behaviour in case it's not desired. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Feb 26, 2025 at 09:22 UTC 42846efc3ba31cc0384ca57a70b27fc37313c6ad

2 files changed +10 -11

meson.build

+8 -9

@@ -191,9 +191,11 @@ project('git', 'c',

191 fs = import('fs')

192

193 program_path = []

194 -# Git for Windows provides all the tools we need to build Git.

195 -if host_machine.system() == 'windows'

196 - program_path += [ 'C:/Program Files/Git/bin', 'C:/Program Files/Git/usr/bin' ]

194 +if get_option('sane_tool_path').length() != 0

195 + program_path = get_option('sane_tool_path')

196 +elif host_machine.system() == 'windows'

197 + # Git for Windows provides all the tools we need to build Git.

198 + program_path = [ 'C:/Program Files/Git/bin', 'C:/Program Files/Git/usr/bin' ]

199 endif

200

201 cygpath = find_program('cygpath', dirs: program_path, required: false)

@@ -212,10 +214,6 @@ foreach path : program_path

214 script_environment.prepend('PATH', path)

215 endforeach

216

215 -if get_option('sane_tool_path') != ''

216 - script_environment.prepend('PATH', get_option('sane_tool_path'))

217 -endif

218 -

217 # The environment used by GIT-VERSION-GEN. Note that we explicitly override

218 # environment variables that might be set by the user. This is by design so

219 # that we always use whatever Meson has configured instead of what is present

@@ -671,8 +669,9 @@ build_options_config.set('GIT_TEST_UTF8_LOCALE', '')

669 build_options_config.set_quoted('LOCALEDIR', fs.as_posix(get_option('prefix') / get_option('localedir')))

670 build_options_config.set('GITWEBDIR', fs.as_posix(get_option('prefix') / get_option('datadir') / 'gitweb'))

671

674 -if get_option('sane_tool_path') != ''

675 - build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + get_option('sane_tool_path') + '"|')

672 +if get_option('sane_tool_path').length() != 0

673 + sane_tool_path = (host_machine.system() == 'windows' ? ';' : ':').join(get_option('sane_tool_path'))

674 + build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + sane_tool_path + '"|')

675 else

676 build_options_config.set_quoted('BROKEN_PATH_FIX', '/^\# @BROKEN_PATH_FIX@$/d')

677 endif

meson_options.txt

+2 -2

@@ -13,8 +13,8 @@ option('perl_cpan_fallback', type: 'boolean', value: true,

13 description: 'Install bundled copies of CPAN modules that serve as a fallback in case the modules are not available on the system.')

14 option('runtime_prefix', type: 'boolean', value: false,

15 description: 'Resolve ancillary tooling and support files relative to the location of the runtime binary instead of hard-coding them into the binary.')

16 -option('sane_tool_path', type: 'string', value: '',

17 - description: 'A colon-separated list of paths to prepend to PATH if your tools in /usr/bin are broken.')

16 +option('sane_tool_path', type: 'array', value: [],

17 + description: 'An array of paths to pick up tools from in case the normal tools are broken or lacking.')

19 # Build information compiled into Git and other parts like documentation.

20 option('build_date', type: 'string', value: '',