From patchwork Fri Jun 18 17:16:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30441 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 5C8A827BC84; Fri, 18 Jun 2021 18:22:53 +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_H4,RCVD_IN_MSPIKE_WL, 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 06BE227BC81 for ; Fri, 18 Jun 2021 18:22:53 +0100 (BST) Received: from localhost ([::1]:55942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luICi-00040G-2N for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 13:22:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIAC-00084q-0Z for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIAB-0004I8-Nq for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIAB-0004ur-KC for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 core-updates 25/37] bash: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 17:20:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162403679418604 (code B ref 49025); Fri, 18 Jun 2021 17:20:15 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:54 +0000 Received: from localhost ([127.0.0.1]:58068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9q-0004pu-BD for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:54 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9D-0004jA-NU for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKFdT; Fri, 18 Jun 2021 19:19:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:19 +0200 Message-Id: <20210618171631.20534-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624036755; bh=1zWLyKNdDiD8e2cuo2aK9D7rNa9KmEnbc2E+HBexX54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=FQ1dtlRnitZ4MloYmgv95nUI60F5h1KuKbxv3qwynD9V9qiAB6+np8dd8cVGUGTqT cru/9jEbCv4SYIsIYj7+kyxebSTQAfcI9FbUWpmKLuGMDn6ye6CggcAFnrFKgm9/hQ nnBzpZSlNsXoyuveF/1KzQdX6N4wtJAtYt4BjF0dErvq7fMDml//KAGDbllWOBvcOK UE6wxyrW+CpbJxULtfcofBqYgjcpUiF6ECnoV5s1u17XruQCuFSqDKIXErWPfZvQ9a Lm723erwXfUqt5XwuSaZsbcpo6G+p5yvLrE3EUz5xjELHf0zotckUD34E6WeqK1Wb3 RzHTaisbdTiyQ== 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: , Reply-To: 49025@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows using this-package-input later. * gnu/packages/bash.scm (bash)[arguments]<#:configure-flags>: Make this a G-expression instead of a raw S-expression. --- gnu/packages/bash.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 7e98367bbb..b3af873a66 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -109,15 +109,15 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." "-DSSH_SOURCE_BASHRC") " ")) (configure-flags - ``("--with-installed-readline" - ,,(string-append "CPPFLAGS=" cppflags) - ,(string-append - "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "readline") - "/lib" - " -Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib"))) + #~`("--with-installed-readline" + ,#$(string-append "CPPFLAGS=" cppflags) + ,(string-append + "LDFLAGS=-Wl,-rpath -Wl," + (assoc-ref %build-inputs "readline") + "/lib" + " -Wl,-rpath -Wl," + (assoc-ref %build-inputs "ncurses") + "/lib"))) (version "5.1")) (package (name "bash") @@ -143,8 +143,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." `(;; When cross-compiling, `configure' incorrectly guesses that job ;; control is missing. #:configure-flags ,(if (%current-target-system) - `(cons* "bash_cv_job_control_missing=no" - ,configure-flags) + #~(cons* "bash_cv_job_control_missing=no" + #$configure-flags) configure-flags) ;; Bash is reportedly not parallel-safe. See, for instance,