git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 2/2] meson: prefer shell at "/bin/sh"

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 25, 2025, 17:04 UTC
Message-ID
<xmqqy0votbns.fsf@gitster.g>
In-Reply-To
<20250425-pks-meson-posix-shell-v3-2-01607a2e9334@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 21 quoted lines
> Meson detects the path of the target shell via `find_program("sh")`,
> which essentially does a lookup via `PATH`. This may easily lead to a
> subtly-broken Git distribution when the build host has its shell in a
> location that the target host doesn't know about.
>
> Fix the issue by appending "/bin" to the custom program path, which
> causes us to prefer "/bin/sh" over a `PATH`-based lookup. While
> "/bin/sh" isn't standardized, this path tends to work alright on Linux
> and BSD distributions. Furthermore, "/bin/sh" is also the path we pick
> in our Makefile by default, which further demonstrates that this shell
> fulfills our needs.
>
> Note that we intentionally append, not prepend, to the custom program
> path. This is because the program path can be configured by the user via
> the `-Dsane_tool_path=` build option, which should take precedence over
> any defaults we pick for the user.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  meson.build | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
Looking good.
Show 14 quoted lines
> diff --git a/meson.build b/meson.build
> index a180c66ee69..6a90310a2ca 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -236,7 +236,11 @@ sed = find_program('sed', dirs: program_path, native: true)
>  shell = find_program('sh', dirs: program_path, native: true)
>  tar = find_program('tar', dirs: program_path, native: true)
>  
> -target_shell = find_program('sh', dirs: program_path, native: false)
> +# Detect the target shell that is used by Git at runtime. Note that we prefer
> +# "/bin/sh" over a PATH-based lookup, which provides a working shell on most
> +# supported systems. This path is also the default shell path used by our
> +# Makefile. This lookup can be overridden via `program_path`.
> +target_shell = find_program('sh', dirs: program_path + [ '/bin' ], native: false)

I wonder if we should be a bit more friendly to beginners (either 'meson' beginner or a newcomer to the project who are not yet familiar with how our meson.build files are written), than saying "via 'program_path'" by referring to "-Dsane_tool_path=", possibly even with an example.

Now I am showing my ignorance, but does this support folks whose shell are not spelled "sh" (like "/usr/local/bin/dash"), and more importantly, if it does not, shouldn't we be using a mechanism that does? I think -Dsane_tool_path=/usr/local/bin would help with the leading directory path, but I suspect that find_program() does not help specifying "dash" to be used as our target_shell (or host shell), or "perl5" as our perl.

Of course, this "my sh is called dash" can be left totally outside of the topic of these two patches.

Thanks.
Previous: Patrick SteinhardtNext: Eli Schwartz
Message 22 of 31 in “meson: prefer '/bin/sh' over PATH lookup”
  1. 0/2 meson: prefer '/bin/sh' over PATH lookupPatrick Steinhardt, Apr 24, 2025
  2. 2/2 meson: prefer POSIX-specified shell pathPatrick Steinhardt, Apr 24, 2025
  3. Justin ToblerApr 24, 2025
  4. Patrick SteinhardtApr 25, 2025
  5. 1/2 meson: report detected runtime executable pathsPatrick Steinhardt, Apr 24, 2025
  6. Eli SchwartzApr 25, 2025
  7. Patrick SteinhardtApr 25, 2025
  8. Junio C HamanoApr 25, 2025
  9. Junio C HamanoApr 24, 2025
  10. Patrick SteinhardtApr 25, 2025
  11. 0/2 meson: prefer '/bin/sh' over PATH lookupPatrick Steinhardt, Apr 25, 2025
  12. 1/2 meson: report detected runtime executable pathsPatrick Steinhardt, Apr 25, 2025
  13. Toon ClaesApr 25, 2025
  14. 2/2 meson: prefer POSIX-specified shell pathPatrick Steinhardt, Apr 25, 2025
  15. Toon ClaesApr 25, 2025
  16. brian m. carlsonApr 25, 2025
  17. Patrick SteinhardtApr 25, 2025
  18. Toon ClaesApr 25, 2025
  19. 0/2 meson: prefer '/bin/sh' over PATH lookupPatrick Steinhardt, Apr 25, 2025
  20. 1/2 meson: report detected runtime executable pathsPatrick Steinhardt, Apr 25, 2025
  21. 2/2 meson: prefer shell at "/bin/sh"Patrick Steinhardt, Apr 25, 2025
  22. Junio C HamanoApr 25, 2025
  23. Eli SchwartzApr 25, 2025
  24. Junio C HamanoApr 25, 2025
  25. Eli SchwartzApr 25, 2025
  26. brian m. carlsonApr 25, 2025
  27. Eli SchwartzApr 25, 2025
  28. brian m. carlsonApr 25, 2025
  29. Junio C HamanoMay 2, 2025
  30. Eli SchwartzMay 2, 2025
  31. Patrick SteinhardtMay 5, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.