[v2,0/5] Collection of build fixes

Message

Patrick Steinhardt March 31, 2025, 8:33 a.m. UTC

Hi,

this small patch series collects various different smallish fixes for
issues with the build systems. The intent here is to bundle all of them
into a single series to make it a bit easier for Junio to keep track of
them.

More specifically, this series:

  - Fixes an issue with handling "-Dcurl=auto" that I spotted recently.

  - Replaces Sam's "sj/meson-test-environ-fix" [1] with an alternative
    solution. The branch is currently in "seen".

  - Picks up and massages Thorsten's patch from [2] to fix generation of
    "gitweb.js". The fix has not yet been picked up by Junio.

  - Picks up a cross-compilation fix for Meson [3]. There has been a bit
    of discussion with Peter whether this is the proper fix, but based
    on Eli's feedback it should be okay. I'm still open for alternative
    implementations in case anybody has suggestions for how to do them.

Please let me know if any of you are unhappy with the way I have given
credit. I'm totally happy to change authorship or adjust trailers.

Changes in v2:
  - Drop the fix for Perl-less documentation builds.
  - Pick up the fix to use correct environment in our CI builds.
    Johannes mentioned that he wants to eventually get rid of those
    builds completely, but meanwhile this is a trivial change to make
    the jobs do what they should.
  - Pick up the improvement for cross-compiling Git.
  - Link to v1: https://lore.kernel.org/r/[e-mail]

Thanks!

Patrick

[1]: <[e-mail]>
[2]: <[e-mail]>
[3]: <[e-mail]>

---
Patrick Steinhardt (5):
      meson: fix handling of '-Dcurl=auto'
      gitweb: fix generation of "gitweb.js"
      meson: respect 'tests' build option in contrib
      meson: distinguish build and target host binaries
      ci: use Visual Studio for win+meson job on GitHub Workflows

 .github/workflows/main.yml           |  2 +-
 .gitlab-ci.yml                       |  2 +-
 Documentation/meson.build            | 12 +++----
 contrib/credential/netrc/meson.build | 22 ++++++------
 contrib/subtree/meson.build          | 20 ++++++-----
 gitweb/Makefile                      |  2 +-
 gitweb/meson.build                   |  2 +-
 meson.build                          | 68 +++++++++++++++++++++++++++---------
 templates/meson.build                |  4 +--
 9 files changed, 87 insertions(+), 47 deletions(-)

Range-diff versus v1:

1:  4bc8060a975 = 1:  3e9137c2d18 meson: fix handling of '-Dcurl=auto'
2:  4365cfc4a4e = 2:  7ba983d446e gitweb: fix generation of "gitweb.js"
3:  02d6ae13dd2 < -:  ----------- meson: require Perl when building docs
4:  fcf2478bd82 = 3:  33cd3e490eb meson: respect 'tests' build option in contrib
-:  ----------- > 4:  1cb210c91a1 meson: distinguish build and target host binaries
-:  ----------- > 5:  3172db10a10 ci: use Visual Studio for win+meson job on GitHub Workflows

---
base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
change-id: 20250328-b4-pks-collect-build-fixes-b5a6ce086b72

Comments

Johannes Schindelin April 1, 2025, 4:41 p.m. UTC | #1

Hi Patrick,

On Mon, 31 Mar 2025, Patrick Steinhardt wrote:

> this small patch series collects various different smallish fixes for
> issues with the build systems. The intent here is to bundle all of them
> into a single series to make it a bit easier for Junio to keep track of
> them.
>
> More specifically, this series:
>
>   - Fixes an issue with handling "-Dcurl=auto" that I spotted recently.
>
>   - Replaces Sam's "sj/meson-test-environ-fix" [1] with an alternative
>     solution. The branch is currently in "seen".
>
>   - Picks up and massages Thorsten's patch from [2] to fix generation of
>     "gitweb.js". The fix has not yet been picked up by Junio.
>
>   - Picks up a cross-compilation fix for Meson [3]. There has been a bit
>     of discussion with Peter whether this is the proper fix, but based
>     on Eli's feedback it should be okay. I'm still open for alternative
>     implementations in case anybody has suggestions for how to do them.

These all look good to me (with the exception of the cross-compilation
fix, but only because I am too unfamiliar with Meson to speak about the
correctness of this patch).

>
> Please let me know if any of you are unhappy with the way I have given
> credit. I'm totally happy to change authorship or adjust trailers.
>
> Changes in v2:
>   - Drop the fix for Perl-less documentation builds.
>   - Pick up the fix to use correct environment in our CI builds.
>     Johannes mentioned that he wants to eventually get rid of those
>     builds completely, but meanwhile this is a trivial change to make
>     the jobs do what they should.

More precisely, since we are now spending around 9.5 hours of total CPU
time for every single CI build (completely running over the concurrency
limit of 20 parallel jobs on GitHub even for a single CI run, with the
obvious congestion when there are parallel CI runs), I want to drop all
pretense that Git supports CMake builds on Windows (or Visual Studio
builds, for that matter). It's just too much of an uphill battle and I no
longer have the will to deal with it.

Thank you for reminding me that I wanted to work on that patch.

Ciao,
Johannes

>   - Pick up the improvement for cross-compiling Git.
>   - Link to v1: https://lore.kernel.org/r/[e-mail]
>
> Thanks!
>
> Patrick
>
> [1]: <[e-mail]>
> [2]: <[e-mail]>
> [3]: <[e-mail]>
>
> ---
> Patrick Steinhardt (5):
>       meson: fix handling of '-Dcurl=auto'
>       gitweb: fix generation of "gitweb.js"
>       meson: respect 'tests' build option in contrib
>       meson: distinguish build and target host binaries
>       ci: use Visual Studio for win+meson job on GitHub Workflows
>
>  .github/workflows/main.yml           |  2 +-
>  .gitlab-ci.yml                       |  2 +-
>  Documentation/meson.build            | 12 +++----
>  contrib/credential/netrc/meson.build | 22 ++++++------
>  contrib/subtree/meson.build          | 20 ++++++-----
>  gitweb/Makefile                      |  2 +-
>  gitweb/meson.build                   |  2 +-
>  meson.build                          | 68 +++++++++++++++++++++++++++---------
>  templates/meson.build                |  4 +--
>  9 files changed, 87 insertions(+), 47 deletions(-)
>
> Range-diff versus v1:
>
> 1:  4bc8060a975 = 1:  3e9137c2d18 meson: fix handling of '-Dcurl=auto'
> 2:  4365cfc4a4e = 2:  7ba983d446e gitweb: fix generation of "gitweb.js"
> 3:  02d6ae13dd2 < -:  ----------- meson: require Perl when building docs
> 4:  fcf2478bd82 = 3:  33cd3e490eb meson: respect 'tests' build option in contrib
> -:  ----------- > 4:  1cb210c91a1 meson: distinguish build and target host binaries
> -:  ----------- > 5:  3172db10a10 ci: use Visual Studio for win+meson job on GitHub Workflows
>
> ---
> base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
> change-id: 20250328-b4-pks-collect-build-fixes-b5a6ce086b72
>
>
>