On 25/07/03 11:28AM, Patrick Steinhardt wrote:
> When Python features are enabled we search both for a native and
> non-native version of Python. This is wrong though: we don't use Python
> in our build process, so there is no need to search for it in the first
> place.
>
> There is one location where we use the native version of Python, namely
> when deciding whether or not we want to wire up git-p4(1). This check is
> invalid though, as we shouldn't check for the build host to have Python,
> but for the target host.
Ok, we are using the native python version, but we should really care
wether the target host has python.
> Fix this invalid check to use the non-native version of Python and stop
> searching for a native version of Python altogether.
>
> Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
> ---
> meson.build | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 7fea4a34d68..21fdff0f496 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -866,9 +866,8 @@ if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
> endif
> build_options_config.set_quoted('X', executable_suffix)
>
> -python = import('python').find_installation('python3', required: get_option('python'))
> -target_python = find_program('python3', native: false, required: python.found())
> -if python.found()
> +target_python = find_program('python3', native: false, required: get_option('python'))
> +if target_python.found()
Ok, so here we are not actually using python to build, but instead need
to know whether to include this build configuration which is dependent
on the target host having python. Makes sense.
It might be nice to leave a comment here to explain this. The changes in
this patch look good though.
> build_options_config.set('NO_PYTHON', '')
> else
> libgit_c_args += '-DNO_PYTHON'
> @@ -1979,7 +1978,7 @@ if perl_features_enabled
> subdir('perl')
> endif
>
> -if python.found()
> +if target_python.found()
> scripts_python = [
> 'git-p4.py'
> ]
> @@ -2202,7 +2201,7 @@ summary({
> 'iconv': iconv.found(),
> 'pcre2': pcre2.found(),
> 'perl': perl_features_enabled,
> - 'python': python.found(),
> + 'python': target_python.found(),
> }, section: 'Auto-detected features')
>
> summary({
>
> --
> 2.50.0.195.g74e6fc65d0.dirty
>
>
