From patchwork Fri Jul 2 10:06:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 30908 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D422227BC81; Fri, 2 Jul 2021 11:10:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9625327BC78 for ; Fri, 2 Jul 2021 11:10:52 +0100 (BST) Received: from localhost ([::1]:34046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzG8J-0002u2-MT for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:10:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6d-00076O-Em for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6d-0004LE-5u for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6d-0008K4-02 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 005/128] gnu: guix-build-coordinator: Simplify usage of 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:09:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.162522053731751 (code B ref 49327); Fri, 02 Jul 2021 10:09:06 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:08:57 +0000 Received: from localhost ([127.0.0.1]:34395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6R-0008Fh-UF for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:56 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6G-0008C0-93 for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:45 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8jBp; Fri, 02 Jul 2021 12:08:43 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:11 +0200 Message-Id: <20210702100814.23249-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702100814.23249-1-maximedevos@telenet.be> References: <20210702100814.23249-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220523; bh=EbJbVZRNJ5oshVvG4dj97Qe/hmhBR+tt4WVIG0yEzc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MTE4DKogoTpagicq0PrHIi1D3kvs09682XyE8BmCc8R3J4TAG9TLpdY+dto/zR/W1 K05SGVC0uZcK/p474ZhKYGXzW/qdIhz+yVsNVaKbXcWq8DEAf+t1u5C6EkDSax5c3e b2JeMRvALhWrr53miHmwXv2lEpNRUJLHq/7oQy6AxRnGP4d8KVT0gSc2DijxVrQxDn 4wV4xRP1ttGVyXmBmx1pzLxz55LAufevfpslQyMsd18Sacd0bHyUvoIv2YUAjczsWt LGHliW7pG7BAYH29AoxYgee3mEVFbtOGJPZYYWT9XdN26OdWXSN9aAUK6mt9UsoxXf 9tlBmIDCqZW2A== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (guix-build-coordinator)[arguments]<#:phases>{wrap-executable}: Set #:sh argument of 'wrap-program'. Don't substitute the interpreter with another interpreter. Drop the 'target' argument. (guix-build-coordinator)[inputs]{bash}: Make this input unconditional. --- gnu/packages/package-management.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7229723ab8..680fd18a7e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -1056,10 +1057,11 @@ environments.") (setenv "GUILE_AUTO_COMPILE" "0") #t)) (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs target #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (guile (assoc-ref inputs "guile")) + (bash (assoc-ref inputs "bash")) (version (target-guile-effective-version)) (scm (string-append out "/share/guile/site/" version)) (go (string-append out "/lib/guile/" version "/site-ccache"))) @@ -1079,7 +1081,7 @@ environments.") ,@(if (hurd-target?) '() '("guile-fibers"))))) - (wrap-program file + (wrap-program file #:sh (string-append bash "/bin/bash") `("PATH" ":" prefix (,bin ;; Support building without sqitch as an input, as it @@ -1104,14 +1106,7 @@ environments.") (assoc-ref inputs input) version)) guile-inputs) - ":")))) - (when target - ;; XXX work around wrap-program picking bash for the - ;; host rather than target - (let ((bash (assoc-ref inputs "bash"))) - (substitute* file - (("^#!.*/bash") - (string-append "#! " bash "/bin/bash"))))))) + ":")))))) (find-files bin))) #t)) (delete 'strip)))) ; As the .go files aren't compatible @@ -1131,9 +1126,7 @@ environments.") ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) - ,@(if (%current-target-system) - `(("bash" ,bash-minimal)) - '()) + ("bash" ,bash-minimal) ; for wrap-program ("sqlite" ,sqlite) ,@(if (hurd-target?) '()