]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/misc-build-fixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2025 20:54:18 +0000 (13:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2025 20:54:18 +0000 (13:54 -0700)
Random build fixes.

* ps/misc-build-fixes:
  ci: use Visual Studio for win+meson job on GitHub Workflows
  meson: distinguish build and target host binaries
  meson: respect 'tests' build option in contrib
  gitweb: fix generation of "gitweb.js"
  meson: fix handling of '-Dcurl=auto'

1  2 
.github/workflows/main.yml
Documentation/meson.build
meson.build

Simple merge
index 8b9e692c5992afa63d3438a4c5aa9ec9d111ebcb,32f0c5de12a28598f56343c104271c10cca88f65..8d9cd985487bcbec192ebbde33c3161dcd9b1e3c
@@@ -205,19 -205,11 +205,19 @@@ manpages = 
    'gitworkflows.adoc' : 7,
  }
  
 +manpages_breaking_changes = {
 +  'git-pack-redundant.adoc' : 1,
 +}
 +
 +if not get_option('breaking_changes')
 +  manpages += manpages_breaking_changes
 +endif
 +
  docs_backend = get_option('docs_backend')
  if docs_backend == 'auto'
-   if find_program('asciidoc', dirs: program_path, required: false).found()
+   if find_program('asciidoc', dirs: program_path, native: true, required: false).found()
      docs_backend = 'asciidoc'
-   elif find_program('asciidoctor', dirs: program_path, required: false).found()
+   elif find_program('asciidoctor', dirs: program_path, native: true, required: false).found()
      docs_backend = 'asciidoctor'
    else
      error('Neither asciidoc nor asciidoctor were found.')
diff --cc meson.build
Simple merge