GNU bug report logs - #49756
[PATCH][core-updates] build-system: asdf: Remove %build-inputs reference.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49756 in the body.
You can then email your comments to 49756 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: guix-patches <at> gnu.org
Cc: Mathieu Othacehe <othacehe <at> gnu.org>
Subject: [PATCH][core-updates] build-system: asdf: Remove %build-inputs
 reference.
Date: Wed, 28 Jul 2021 16:13:26 +0200

This is a follow-up of 7d873f194ca69d6096d28d7a224ab78e83e34fe1 that removes
the %build-inputs variable.

* guix/build-system/asdf.scm (asdf-build): Remove %build-inputs reference.
---
Hello,

This fixes the asdf based builds on core-updates.

Thanks,

Mathieu

 guix/build-system/asdf.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm
index 79de2ee5ba..f4ad7252df 100644
--- a/guix/build-system/asdf.scm
+++ b/guix/build-system/asdf.scm
@@ -28,7 +28,8 @@
   #:use-module (guix search-paths)
   #:use-module ((guix build utils)
                 #:select ((package-name->name+version
-                           . hyphen-separated-name->name+version)))
+                           . hyphen-separated-name->name+version)
+                          search-input-file))
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
   #:use-module (ice-9 match)
@@ -295,9 +296,9 @@ set up using CL source package conventions."
       (with-imported-modules imported-modules
         #~(begin
             (use-modules #$@(sexp->gexp modules))
-            (parameterize ((%lisp (string-append
-                                   (assoc-ref %build-inputs #$lisp-type)
-                                   "/bin/" #$lisp-type))
+            (parameterize ((%lisp (search-input-file
+                                   #$(input-tuples->gexp inputs)
+                                   (string-append "bin/" #$lisp-type)))
                            (%lisp-type #$lisp-type))
               (asdf-build #:name #$name
                           #:source #+source
-- 
2.32.0

Message #8 received at 49756 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: 49756 <at> debbugs.gnu.org
Subject: Re: [bug#49756] [PATCH][core-updates] build-system: asdf: Remove
 %build-inputs reference.
Date: Wed, 28 Jul 2021 16:20:45 +0200

>                  #:select ((package-name->name+version
> -                           . hyphen-separated-name->name+version)))
> +                           . hyphen-separated-name->name+version)
> +                          search-input-file))

This hunk is not needed.

Mathieu

Message #11 received at 49756 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: 49756 <at> debbugs.gnu.org
Subject: Re: bug#49756: [PATCH][core-updates] build-system: asdf: Remove
 %build-inputs reference.
Date: Thu, 29 Jul 2021 10:18:44 +0200

Hi,

Mathieu Othacehe <othacehe <at> gnu.org> skribis:

> This is a follow-up of 7d873f194ca69d6096d28d7a224ab78e83e34fe1 that removes
> the %build-inputs variable.
>
> * guix/build-system/asdf.scm (asdf-build): Remove %build-inputs reference.

LGTM! (modulo the unnecessary hunk)

Note that I left ‘%build-inputs’ in the “main” build systems, but
semi-intentionally left it out in other build systems, the idea being
that we should no longer need it now, and it was already rarely used.

Thanks,
Ludo’.

Message #16 received at 49756-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 49756-done <at> debbugs.gnu.org
Subject: Re: bug#49756: [PATCH][core-updates] build-system: asdf: Remove
 %build-inputs reference.
Date: Thu, 29 Jul 2021 10:29:44 +0200

Hey,

> Note that I left ‘%build-inputs’ in the “main” build systems, but
> semi-intentionally left it out in other build systems, the idea being
> that we should no longer need it now, and it was already rarely used.

I see, thanks for explaining!

Closing this one,

Mathieu

Previous Next

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