From patchwork Mon Jun 14 15:38:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30273 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 91FE027BC81; Mon, 14 Jun 2021 17:09:12 +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 25ADE27BC78 for ; Mon, 14 Jun 2021 17:09:12 +0100 (BST) Received: from localhost ([::1]:55556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp9D-0004Uw-83 for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 12:09:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsp7B-0001oa-0S for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsp7A-0008NA-5S for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsp7A-00055D-0K for guix-patches@gnu.org; Mon, 14 Jun 2021 12:07:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH core-updates 26/37] bash: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Jun 2021 16:07:03 +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.162368679419464 (code B ref 49025); Mon, 14 Jun 2021 16:07:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 16:06:34 +0000 Received: from localhost ([127.0.0.1]:47699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsp6f-00053n-Rg for submit@debbugs.gnu.org; Mon, 14 Jun 2021 12:06:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofi-00049r-R5 for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:43 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3ei250060mfAB4013eic1; Mon, 14 Jun 2021 17:38:42 +0200 Message-ID: From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:42 +0200 In-Reply-To: References: 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=1623685122; bh=QW0tjiTW+CkVuxysVui/WJvw5+glTVXo+zI/KaKqgX4=; h=Subject:From:To:Date:In-Reply-To:References; b=TiJK7VkG475DJXkWBFH75Fcn2P9CV2Pzgx3ZAaTubSp0cZjLtgt8TTAm0K4Ioo8wU pw7QITvWg8DJ1rETviDtra8XfBqbnA8mHFtHFNluX3dt5ZWqcc/a1wx6hbXjxbknxb rl03r3tYDMLq8MGNn/DkWJWs1PaVs7s9eyRX8U6s4+PITkEO/Mct09IeEokFI/mak2 YvTo37bjoNLGDSG+dFUlbK2VawMbdLW3pPDGrKHh6smCHm0ku1evrCqRMJ9xZ+Zc3d 0/RL3/vNQq8llewIGJ/LdswBe741gteZBLrkThl7qEEMOM6wUv5+apaQVfkt3W2ys7 JJm0A+SPGn84A== 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 %build-inputs does not exist when cross-compiling, so use this-package-input instead. * gnu/packages/bash.scm (bash)[arguments]<#:configure-flags>: Use this-package-input instead of %build-inputs. --- gnu/packages/bash.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index b3af873a66..d51ab26bc8 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -103,22 +103,25 @@ number/base32-hash tuples, directly usable in the 'patch-series' form." 1)) (define-public bash - (let* ((cppflags (string-join '("-DDEFAULT_PATH_VALUE='\"/no-such-path\"'" - "-DSTANDARD_UTILS_PATH='\"/no-such-path\"'" - "-DNON_INTERACTIVE_LOGIN_SHELLS" - "-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"))) - (version "5.1")) + (let ((cppflags (string-join '("-DDEFAULT_PATH_VALUE='\"/no-such-path\"'" + "-DSTANDARD_UTILS_PATH='\"/no-such-path\"'" + "-DNON_INTERACTIVE_LOGIN_SHELLS" + "-DSSH_SOURCE_BASHRC") + " ")) + (version "5.1")) + ;; Delay expansion to inside a lexical environment + ;; where this-package is bound. + (define-syntax configure-flags + (identifier-syntax + #~`("--with-installed-readline" + ,#$(string-append "CPPFLAGS=" cppflags) + ,(string-append + "LDFLAGS=-Wl,-rpath -Wl," + ;; %build-inputs does not exist when cross-compiling, + ;; so use this-package-input instead. + #$(file-append (this-package-input "readline") "/lib") + " -Wl,-rpath -Wl," + #$(file-append (this-package-input "ncurses") "/lib"))))) (package (name "bash") (source (origin