From patchwork Sat Jun 19 15:04:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30481 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 5CBDE27BC81; Sat, 19 Jun 2021 16:07:59 +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 2F64027BC78 for ; Sat, 19 Jun 2021 16:07:59 +0100 (BST) Received: from localhost ([::1]:53842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucZi-0001yj-46 for patchwork@mira.cbaines.net; Sat, 19 Jun 2021 11:07:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-000821-LK for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY0-0007yG-Eb for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY0-0005gK-A2 for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 25/36] bash: Make #:configure-flags a G-expression. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:12 +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.162411516021583 (code B ref 49025); Sat, 19 Jun 2021 15:06:12 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:00 +0000 Received: from localhost ([127.0.0.1]:60388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXn-0005bx-Nm for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:59 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005VD-Tn for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqp; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:47 +0200 Message-Id: <20210619150458.12057-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=1zWLyKNdDiD8e2cuo2aK9D7rNa9KmEnbc2E+HBexX54=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xzr8cCIrvUYT7YqetK7obTgYyOajXZ73gR4PjQWgHZkypDLxkdwJfp+tuJWI3DNEc fbWp7tHOxAKyZo+5aFngc9v/Ip7WRYyhfLlp9L6UNDH3T8ZVL4iSzOyLT6q+xynVNc KfjMfmbzVNugsw06xP3IrsLMgEJoOYXJtkP1Tm9iBBbUN7aJAGL7rVEiEJJ+Q9Z4iz CCWmJntNN7u+ZJ1K+cCGLaVWc22w/sOSvhflLZQzGnpYwbl5uyWCJEn162M7rzWz2V 2qHVgUifQVKn38GgooB3+Zlh9YILzFPEdoWBGR5zJTwz+m6DqlQHJVClv4w1gampUw R8FypZFBqAR/g== 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 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,