GNU bug report logs - #51948
[PATCH] [core-updates-frozen] Wrap meson with python code

Previous Next

Full log

View this message in rfc822 format

From: Ludovic Courtès <ludo <at> gnu.org>
To: Vivien Kraus <vivien <at> planete-kraus.eu>
Cc: 51948 <at> debbugs.gnu.org
Subject: [bug#51948] [PATCH] Meson needs proper wrapping
Date: Fri, 19 Nov 2021 14:12:43 +0100

Hi!

Vivien Kraus <vivien <at> planete-kraus.eu> skribis:

> Meson needs to be wrapped, but the wrapping must not execute a new
> process, if I understand correctly. I could use wrap-script, but I think
> it’s more pythonic to set the path through sys.path rather than setting
> an environment variable.

Isn’t that what ‘wrap-script’ does?

> Now, this will create a world rebuild… What do you think?

Not good!  :-)

This Meson issue is not a regression compared to master, is it?

How about providing a user-facing ‘meson’ package that incorporates this
fix, while keeping the other ‘meson’ packages unchanged, to avoid
rebuilding too much?  This can be achieved by marking the other packages
as hidden.

> From 08845844e8e1a18232bf54f9f3f0b71d5e0c71ef Mon Sep 17 00:00:00 2001
> From: Vivien Kraus <vivien <at> planete-kraus.eu>
> Date: Thu, 18 Nov 2021 15:17:52 +0100
> Subject: [PATCH] gnu: meson: Extend the python path in the installed program.
>
> * gnu/packages/build-tools.scm (meson) [phase wrap]: Wrap the python path as
> python code.
> ---
>  gnu/packages/build-tools.scm | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
> index 849101c2a4..ef5aa4bd35 100644
> --- a/gnu/packages/build-tools.scm
> +++ b/gnu/packages/build-tools.scm
> @@ -283,7 +283,21 @@ (define-public meson
>         #:phases (modify-phases %standard-phases
>                    ;; Meson calls the various executables in out/bin through the
>                    ;; Python interpreter, so we cannot use the shell wrapper.
> -                  (delete 'wrap))))
> +                  (replace 'wrap
> +                    (lambda* (#:key outputs #:allow-other-keys)
> +                      (let ((path (string-split (getenv "GUIX_PYTHONPATH") #\:)))
> +                        (substitute* (string-append (assoc-ref outputs "out") "/bin/meson")

Could you check ‘guix gc --references meson’ to make sure it does not
capture too much?  (GUIX_PYTHONPATH might contain references to
build-time dependencies.)

I suppose GUIX_PYTHONPATH contains the package’s “out”, right?

Thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.