From patchwork Fri Jun 18 16:09:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30389 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 8DD3327BC78; Fri, 18 Jun 2021 17:15:29 +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 03E2027BC81 for ; Fri, 18 Jun 2021 17:15:29 +0100 (BST) Received: from localhost ([::1]:49166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH9U-000061-2X for patchwork@mira.cbaines.net; Fri, 18 Jun 2021 12:15:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5J-0000VF-KD for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46299) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5J-00029u-9G for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5J-0002zU-4c for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 23/37] readline: 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 16:11:09 +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.162403264511234 (code B ref 49025); Fri, 18 Jun 2021 16:11:09 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:45 +0000 Received: from localhost ([127.0.0.1]:57797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4u-0002v1-RD for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:45 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4Y-0002r7-HK for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:22 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAMNz; Fri, 18 Jun 2021 18:10:22 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:22 +0200 Message-Id: <20210618160936.18972-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624032622; bh=6pKRGWeWOQaDnklxh6edH5vqNzGDBgspCLih5AvELa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=LAOw8+62tDPg6PMl6gm5SRPPjMt/yqzVcDp0iIqfOolA4z0jFNsYrcM1JlMOfW6K0 XlsAnavOBBGmiSyo1H6yOFbvGv6Dkcfl5WCr9ntOqyLETDHFMKKCWlyurVcmmKepJS 9gEhboX7IPpqrvpsMathpJbqYd6UVjGiVrS5elNi4c/mqvz/iHEit2rf8a2pcz32KV FF7AiNKgWhrCBTBl4ETxdR1ERh6SvsN/qcS42dkgN2Djsa4bLrrXfZTzSwwHfC3P2r MrP7p1EwX1CqxlLux+wLQ7ALqGm0jsAMsC10B1jYZ6Vy2vEcGtFIcoXB7ipUFxzwcv oonc7F86T+DAw== 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 allos using ungexp and this-package-input later. * gnu/packages/readline.scm (readline)[arguments]<#:configure-flags>: Make this a G-expression. --- gnu/packages/readline.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index b4c91675a4..6cfa24c666 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (ice-9 format)) (define (patch-url version seqno) @@ -76,19 +77,19 @@ (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) (arguments `(#:configure-flags - (list (string-append "LDFLAGS=-Wl,-rpath -Wl," - (assoc-ref %build-inputs "ncurses") - "/lib") + ,#~(list (string-append "LDFLAGS=-Wl,-rpath -Wl," + (assoc-ref %build-inputs "ncurses") + "/lib") - ;; This test does an 'AC_TRY_RUN', which aborts when - ;; cross-compiling, so provide the correct answer. - ,@(if (%current-target-system) - '("bash_cv_wcwidth_broken=no") - '()) - ;; MinGW: ncurses provides the termcap api. - ,@(if (target-mingw?) - '("bash_cv_termcap_lib=ncurses") - '())) + ;; This test does an 'AC_TRY_RUN', which aborts when + ;; cross-compiling, so provide the correct answer. + #$@(if (%current-target-system) + '("bash_cv_wcwidth_broken=no") + '()) + ;; MinGW: ncurses provides the termcap api. + #$@(if (target-mingw?) + '("bash_cv_termcap_lib=ncurses") + '())) ,@(if (target-mingw?) ;; MinGW: termcap in ncurses