* meson build failure on 'seen'
@ 2025-04-15 17:16 Ramsay Jones
2025-04-15 19:11 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Ramsay Jones @ 2025-04-15 17:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
Hi Junio,
Attempting to configure a meson build of the current 'seen'@916e0fb7c0
branch, I find:
$ meson setup --optimization=2 -Dprefix=$HOME -Dpcre2=disabled build/
The Meson build system
...
meson.build:769:46: ERROR: Unknown variable "target_shell".
A full log can be found at /home/ramsay/git/build/meson-logs/meson-log.txt
$
It appears that the tip commit 916e0fb7c0 (Merge branch 'ps/meson-build-perf-bench'
into seen, 2025-04-14) drops the call to 'find_program()' which sets/defines the
'target_shell' variable.
The following diff allows me to configure the build:
$ git diff
diff --git a/meson.build b/meson.build
index 015ead27e6..4d537b7a00 100644
--- a/meson.build
+++ b/meson.build
@@ -237,6 +237,8 @@ shell = find_program('sh', dirs: program_path, native: true)
tar = find_program('tar', dirs: program_path, native: true)
time = find_program('time', dirs: program_path, native: true, required: false)
+target_shell = find_program('sh', dirs: program_path, native: false)
+
# Sanity-check that programs required for the build exist.
foreach tool : ['cat', 'cut', 'grep', 'sort', 'tr', 'uname']
find_program(tool, dirs: program_path, native: true)
$
This allows me to compile the project (I'm still waiting for the test run to
finish).
HTH
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: meson build failure on 'seen'
2025-04-15 17:16 meson build failure on 'seen' Ramsay Jones
@ 2025-04-15 19:11 ` Junio C Hamano
2025-04-16 8:56 ` Patrick Steinhardt
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2025-04-15 19:11 UTC (permalink / raw)
To: Ramsay Jones; +Cc: GIT Mailing-list
Ramsay Jones <ramsay@ramsayjones•plus.com> writes:
> It appears that the tip commit 916e0fb7c0 (Merge branch 'ps/meson-build-perf-bench'
> into seen, 2025-04-14) drops the call to 'find_program()' which sets/defines the
> 'target_shell' variable.
Ahh, indeed. This was the mismerge I was looking for.
Will adjust the broken merge. Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: meson build failure on 'seen'
2025-04-15 19:11 ` Junio C Hamano
@ 2025-04-16 8:56 ` Patrick Steinhardt
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Steinhardt @ 2025-04-16 8:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Ramsay Jones, GIT Mailing-list
On Tue, Apr 15, 2025 at 12:11:32PM -0700, Junio C Hamano wrote:
> Ramsay Jones <ramsay@ramsayjones•plus.com> writes:
>
> > It appears that the tip commit 916e0fb7c0 (Merge branch 'ps/meson-build-perf-bench'
> > into seen, 2025-04-14) drops the call to 'find_program()' which sets/defines the
> > 'target_shell' variable.
>
> Ahh, indeed. This was the mismerge I was looking for.
>
> Will adjust the broken merge. Thanks!
Thanks to both of you!
Patrick
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-16 9:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-15 17:16 meson build failure on 'seen' Ramsay Jones
2025-04-15 19:11 ` Junio C Hamano
2025-04-16 8:56 ` Patrick Steinhardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox