[debbugs-tracker] bug#34903: closed ([PATCH] build-system/meson: Add #:disallowed-references.)

[GNU bug Tracking System]

Your message dated Thu, 21 Mar 2019 19:38:49 +0100
with message-id <address@hidden>
and subject line Re: [bug#34903] [PATCH] build-system/meson: Add 
#:disallowed-references.
has caused the debbugs.gnu.org bug report #34903,
regarding [PATCH] build-system/meson: Add #:disallowed-references.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
34903: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34903
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] build-system/meson: Add #:disallowed-references.
>
>
>
>
> Date: 
>
> Mon, 18 Mar 2019 14:55:36 +0100
>
>
>
>
> * guix/build-system/meson.scm (meson-build): Add #:disallowed-references.
> ---
>  guix/build-system/meson.scm | 26 +++++++++++++++++++++++---
>  1 file changed, 23 insertions(+), 3 deletions(-)
>
> diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
> index 8d49020454..3156f06b94 100644
> --- a/guix/build-system/meson.scm
> +++ b/guix/build-system/meson.scm
> @@ -1,6 +1,6 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
> -;;; Copyright © 2018 Marius Bakke <address@hidden>
> +;;; Copyright © 2018, 2019 Marius Bakke <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -109,9 +109,25 @@
>                        (system (%current-system))
>                        (imported-modules %meson-build-system-modules)
>                        (modules '((guix build meson-build-system)
> -                                 (guix build utils))))
> +                                 (guix build utils)))
> +
> +                      disallowed-references)
>    "Build SOURCE using MESON, and with INPUTS, assuming that SOURCE
>  has a 'meson.build' file."
> +
> +  ;; TODO: Copied from build-system/gnu, factorize this!
> +  (define canonicalize-reference
> +    (match-lambda
> +     ((? package? p)
> +      (derivation->output-path (package-derivation store p system
> +                                                   #:graft? #f)))
> +     (((? package? p) output)
> +      (derivation->output-path (package-derivation store p system
> +                                                   #:graft? #f)
> +                               output))
> +     ((? string? output)
> +      output)))
> +
>    (define builder
>      `(let ((build-phases (if ,glib-or-gtk?
>                               ,phases
> @@ -159,7 +175,11 @@ has a 'meson.build' file."
>                                  #:inputs inputs
>                                  #:modules imported-modules
>                                  #:outputs outputs
> -                                #:guile-for-build guile-for-build))
> +                                #:guile-for-build guile-for-build
> +                                #:disallowed-references
> +                                (and disallowed-references
> +                                     (map canonicalize-reference
> +                                          disallowed-references))))
>  
>  (define meson-build-system
>    (build-system
> -- 
> 2.21.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#34903] [PATCH] build-system/meson: Add #:disallowed-references. Date: Thu, 21 Mar 2019 19:38:49 +0100 User-agent: Notmuch/0.28.2 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu)

Ludovic Courtès <address@hidden> writes:

> Hi Marius!
>
> Marius Bakke <address@hidden> skribis:
>
>> * guix/build-system/meson.scm (meson-build): Add #:disallowed-references.
>
> Go for it!

Thanks!  I went ahead and added #:allowed-references while at it and
pushed as ad4910eec06047124d29cb9a8d4b40dafdb71630.

signature.asc
Description: PGP signature

--- End Message ---