From: Johannes Schindelin <Johannes.Schindelin@gmx•de>
To: Patrick Steinhardt <ps@pks•im>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Sam James <sam@gentoo•org>, Eli Schwartz <eschwartz@gentoo•org>,
Thorsten Glaser <tg@debian•org>,
Peter Seiderer <ps.report@gmx•net>
Subject: Re: [PATCH v2 0/5] Collection of build fixes
Date: Tue, 1 Apr 2025 18:41:43 +0200 (CEST) [thread overview]
Message-ID: <66b9d3d1-9874-8dfd-9de9-5682a7b6655d@gmx.de> (raw)
In-Reply-To: <20250331-b4-pks-collect-build-fixes-v2-0-6b06136808f3@pks.im>
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/20250328-b4-pks-collect-build-fixes-v1-0-ead9deda3fbc@pks.im
>
> Thanks!
>
> Patrick
>
> [1]: <310a34bace801d288e369c6a01a8d04ffc4c3c06.1741975367.git.sam@gentoo•org>
> [2]: <070641d0-730c-7d92-af4a-9157dc1edd3d@debian•org>
> [3]: <20250303-pks-meson-cross-compiling-v1-1-73002ef6432e@pks•im>
>
> ---
> 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
>
>
>
next prev parent reply other threads:[~2025-04-01 16:41 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-28 8:38 [PATCH 0/4] Collection of build fixes Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 1/4] meson: fix handling of '-Dcurl=auto' Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 2/4] gitweb: fix generation of "gitweb.js" Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 3/4] meson: require Perl when building docs Patrick Steinhardt
2025-03-29 17:56 ` Junio C Hamano
2025-03-31 5:59 ` Patrick Steinhardt
2025-03-28 8:38 ` [PATCH 4/4] meson: respect 'tests' build option in contrib Patrick Steinhardt
2025-03-28 18:25 ` Sam James
2025-03-31 8:33 ` [PATCH v2 0/5] Collection of build fixes Patrick Steinhardt
2025-03-31 8:33 ` [PATCH v2 1/5] meson: fix handling of '-Dcurl=auto' Patrick Steinhardt
2025-04-03 8:24 ` Karthik Nayak
2025-03-31 8:33 ` [PATCH v2 2/5] gitweb: fix generation of "gitweb.js" Patrick Steinhardt
2025-04-01 16:30 ` Johannes Schindelin
2025-04-02 6:40 ` Patrick Steinhardt
2025-04-01 16:30 ` Toon Claes
2025-03-31 8:33 ` [PATCH v2 3/5] meson: respect 'tests' build option in contrib Patrick Steinhardt
2025-04-01 16:31 ` Johannes Schindelin
2025-03-31 8:33 ` [PATCH v2 4/5] meson: distinguish build and target host binaries Patrick Steinhardt
2025-04-03 8:38 ` Karthik Nayak
2025-03-31 8:33 ` [PATCH v2 5/5] ci: use Visual Studio for win+meson job on GitHub Workflows Patrick Steinhardt
2025-04-01 16:41 ` Johannes Schindelin [this message]
2025-04-03 8:39 ` [PATCH v2 0/5] Collection of build fixes Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=66b9d3d1-9874-8dfd-9de9-5682a7b6655d@gmx.de \
--to=johannes.schindelin@gmx$(echo .)de \
--cc=eschwartz@gentoo$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ps.report@gmx$(echo .)net \
--cc=ps@pks$(echo .)im \
--cc=sam@gentoo$(echo .)org \
--cc=tg@debian$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox