From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Mar 2025 16:53:01 +0000 (-0800)
Subject: Merge branch 'ps/build-meson-fixes-0130'
X-Git-Tag: v2.49.0-rc1~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab09eddf601501290b5c719574fbe6c02314631f;p=thirdparty%2Fgit.git

Merge branch 'ps/build-meson-fixes-0130'

Assorted fixes and improvements to the build procedure based on
meson.

* ps/build-meson-fixes-0130:
  gitlab-ci: restrict maximum number of link jobs on Windows
  meson: consistently use custom program paths to resolve programs
  meson: fix overwritten `git` variable
  meson: prevent finding sed(1) in a loop
  meson: improve handling of `sane_tool_path` option
  meson: improve PATH handling
  meson: drop separate version library
  meson: stop linking libcurl into all executables
  meson: introduce `libgit_curl` dependency
  meson: simplify use of the common-main library
  meson: inline the static 'git' library
  meson: fix OpenSSL fallback when not explicitly required
  meson: fix exec path with enabled runtime prefix
---

ab09eddf601501290b5c719574fbe6c02314631f
diff --cc Documentation/meson.build
index 1129ce4c85,c6117366ff..0a0f2bfa14
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@@ -284,22 -283,21 +284,21 @@@ elif docs_backend == 'asciidoctor
    ]
  endif
  
- git = find_program('git', required: false)
- xmlto = find_program('xmlto')
+ xmlto = find_program('xmlto', dirs: program_path)
  
  cmd_lists = [
 -  'cmds-ancillaryinterrogators.txt',
 -  'cmds-ancillarymanipulators.txt',
 -  'cmds-mainporcelain.txt',
 -  'cmds-plumbinginterrogators.txt',
 -  'cmds-plumbingmanipulators.txt',
 -  'cmds-synchingrepositories.txt',
 -  'cmds-synchelpers.txt',
 -  'cmds-guide.txt',
 -  'cmds-developerinterfaces.txt',
 -  'cmds-userinterfaces.txt',
 -  'cmds-purehelpers.txt',
 -  'cmds-foreignscminterface.txt',
 +  'cmds-ancillaryinterrogators.adoc',
 +  'cmds-ancillarymanipulators.adoc',
 +  'cmds-mainporcelain.adoc',
 +  'cmds-plumbinginterrogators.adoc',
 +  'cmds-plumbingmanipulators.adoc',
 +  'cmds-synchingrepositories.adoc',
 +  'cmds-synchelpers.adoc',
 +  'cmds-guide.adoc',
 +  'cmds-developerinterfaces.adoc',
 +  'cmds-userinterfaces.adoc',
 +  'cmds-purehelpers.adoc',
 +  'cmds-foreignscminterface.adoc',
  ]
  
  documentation_deps += custom_target(
diff --cc meson.build
index 021a182135,930b85a6df..516207f9cf
--- a/meson.build
+++ b/meson.build
@@@ -672,14 -670,9 +672,15 @@@ build_options_config.set_quoted('GIT_TE
  build_options_config.set_quoted('LOCALEDIR', fs.as_posix(get_option('prefix') / get_option('localedir')))
  build_options_config.set('GITWEBDIR', fs.as_posix(get_option('prefix') / get_option('datadir') / 'gitweb'))
  
 +if get_option('breaking_changes')
 +  build_options_config.set('WITH_BREAKING_CHANGES', 'YesPlease')
 +else
 +  build_options_config.set('WITH_BREAKING_CHANGES', '')
 +endif
 +
- if get_option('sane_tool_path') != ''
-   build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + get_option('sane_tool_path') + '"|')
+ if get_option('sane_tool_path').length() != 0
+   sane_tool_path = (host_machine.system() == 'windows' ? ';' : ':').join(get_option('sane_tool_path'))
+   build_options_config.set_quoted('BROKEN_PATH_FIX', 's|^\# @BROKEN_PATH_FIX@$|git_broken_path_fix "' + sane_tool_path + '"|')
  else
    build_options_config.set_quoted('BROKEN_PATH_FIX', '/^\# @BROKEN_PATH_FIX@$/d')
  endif