From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MHBFBkF7x2CnaQAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 17:52:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id UH1ZAUF7x2BhRAAA1q6Kng (envelope-from ) for ; Mon, 14 Jun 2021 15:52:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8F7E1261C7 for ; Mon, 14 Jun 2021 17:52:32 +0200 (CEST) Received: from localhost ([::1]:43554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsot5-0001L9-G9 for larch@yhetil.org; Mon, 14 Jun 2021 11:52:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog4-00033e-Nb for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog4-0007kW-E1 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog4-0004JO-Ca for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:39:04 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368512016452 (code B ref 49025); Mon, 14 Jun 2021 15:39:04 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:40 +0000 Received: from localhost ([127.0.0.1]:47591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsoff-0004HH-UC for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:40 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofe-0004Ah-FP for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:38 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id H3ed2500R0mfAB4063eeJi; Mon, 14 Jun 2021 17:38:38 +0200 Message-ID: <41a77275fd874e715de39219e0d1798d71519164.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:37 +0200 In-Reply-To: References: Content-Type: multipart/mixed; boundary="=-SPIxnxJg3ZFpC2Hjki3P" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685118; bh=5xbDPLdRjbOi0V9Px4ElNJStLkpmVkRsZpnjmjhWdEA=; h=Subject:From:To:Date:In-Reply-To:References; b=m7lzH2Rcys+hS+YbAAglLLIhcl0IG5TQvLhu3I6Tk28MOma7rzEzT4DfuNpuYOKFj XWKNylFUrfWj35uz05AgKD4vSa3L+6GiKL1TU6e+o7fKkMarl1FH+lT16pOXRyI78r Dp7Jne55kxLiYP7gvYEMQ5aRmby3j6Ib5yCyOSppxP3JtxMkL7RXL8aUCvI9B9ew61 LpS2M0kMvoeC9iAE4mONE9IHFzlOyfL3aJMYcGzoa7yqWnyrLBWGmtI3+LA5QUvv7k xQy8MuDsxdS4PdlUz2pOr1hGd6hC5Xyrb0TKC5yA4e+s+DBUkpYL6D2bCe2DhGasz6 08bFI0YT4tc+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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1623685952; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=5xbDPLdRjbOi0V9Px4ElNJStLkpmVkRsZpnjmjhWdEA=; b=RjxnxMBNPVBcu5o0Yt3jG57/kaKH6aaT0MuzHQ/ULJMSX059fkUgKz3tbYsIe7wCvB97MU cu+GcEmzd8lTgBnEufS1llFYfPupOAIoWLZL2UAhZ8Htso1U9f9uTC9hNOTk2fQVyYRsFP qW20tqeswT9JTOG8LABAMDpcz8o6VLHyaF26doGL6TNVWCvgIxjdmjUcwygxE/lozJsYBK qosUADl1yq064/GNyWqvksGgpfd/wbRaSRjOeO7uGUbpjOApgQcnxyR6JbpFuvChJ1SEht M2P42E+hHAodpc+cm1jGBw4lWKU+o4JIkqtkdwalIZiVmjQi01s9NmW0JlTE7w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623685952; a=rsa-sha256; cv=none; b=IpOwpqZQBV6zQ+aRxfHbkhPvlsYD9iviyT6dVB5ttn3IOGGaxOpfzDf6FSpQBE0WB9iubg CffVqrnmKuFISnOqyFbPw2dcM2qvcF2IDEMrINltpH4iCbwenlIkbqLC3cNqgJ42OvxB3U dD7cpJyZMk1H5lkNpxcqChwOj/ZMt14CVAJzcADcwgbL8KaB7vBdcEHY0PTLep6z1WNRe3 GVGi+atJQ6yLiq6QWtWbZ2mxmUIsvFyqSU9Rmq5KeE5143QLz6vKDGtEIfsOeLPjHFT9q3 kJpTW8IXXMG+sjNm60oovZLBWPFj595uuY9MTII8wO44aquoGWsmfT7Kj1MxNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=m7lzH2Rc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=m7lzH2Rc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8F7E1261C7 X-Spam-Score: -1.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: e48uvCW/3FoW --=-SPIxnxJg3ZFpC2Hjki3P Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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(-) --=-SPIxnxJg3ZFpC2Hjki3P Content-Disposition: attachment; filename="0025-bash-Make-configure-flags-a-G-expression.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0025-bash-Make-configure-flags-a-G-expression.patch"; charset="us-ascii" 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, --=-SPIxnxJg3ZFpC2Hjki3P--