From patchwork Fri Oct 1 14:21:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33522 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 0D38F27BBE3; Fri, 1 Oct 2021 15:32:18 +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,RCVD_IN_MSPIKE_H2,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 CCB2227BBE1 for ; Fri, 1 Oct 2021 15:32:17 +0100 (BST) Received: from localhost ([::1]:54962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJaC-0001pH-SU for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJZz-0001kP-LD for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZz-00062P-Bg for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZz-0005wA-8t for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309869922769 (code B ref 50905); Fri, 01 Oct 2021 14:32:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vA-Ix for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:38 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uR-GQ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv6vbLzMqkmS for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN7; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:39 +0200 Message-Id: <20211001142140.17027-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=v8dpSt+yBNsMIXNs2uxccAIAWbz/Ch1xmzKzziL1T9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uHv/mLD7Bs/2HsfZdfNUefDfcHFPrBFf5o8tSUNMFQkk4rCfMySoJrZ1T7dhcnpA4 Sp7fJ5dEiKymwk5Jt+QpAqxNv1gmXjJsGTltUHHz0X4H0of9+TgYzwS12gexdQn+Df obzCK8g3ISWZxan5HN9oT0M9dxvPEmOmamH7CSO6XoWVWo4EVDncd7AmOU6I7Kjc/G rwChlC6Oi8Rc33niXkEsGNf3zHWX60py6UzDiYxmph0xvpmSn3yAmmmbqE5+Bbi0jl sTFxXZZUvIIU3vVvwL2UseS7hVu6H2QhCkxuVlYeA9F/lA2NtRmxnJcmO65x/xUlnC CDxs/+KvAqoRg== 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 * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir))))))