From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2IjRCc4IzmAdEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:10:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cPljBc4IzmDTFAAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:10:06 +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 9E63A21F2B for ; Sat, 19 Jun 2021 17:10:05 +0200 (CEST) Received: from localhost ([::1]:59564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lucbk-000652-JF for larch@yhetil.org; Sat, 19 Jun 2021 11:10:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081t-Ik for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY3-0007yS-Hq 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 1lucY3-0005hI-DC for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 26/36] bash: Fix cross-compilation build error. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06: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.162411516221639 (code B ref 49025); Sat, 19 Jun 2021 15:06:15 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:02 +0000 Received: from localhost ([127.0.0.1]:60400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXp-0005cl-IZ for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:01 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:33572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX7-0005XM-GZ for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:20 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4G6fH06FGlzMqnrQ for <49025@debbugs.gnu.org>; Sat, 19 Jun 2021 17:05:16 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqt; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:48 +0200 Message-Id: <20210619150458.12057-27-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 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=Jg15KuLDc9Pd0cjkQKGHl1QMNvmHzgPBIjg4oyLTNo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=sKa08S9eayIAB1RdqqVl0WIC5eDqv97iWZOsU63uEiMOFmOfyGoOkGcYkqvKiC2dG 2cA9Co5SEID6hosKWD93jyhouYpvD5LzxGTBZ542txGPjt/tGm6eY5J/7XauVPb9oL 1yBaF58g5iAL1FHTYNPqiMFwf6nZF9SwAPpfC4UYx21Ae3yrt5NgOpdnK0IeoNmL3e NPgLYu1sfd5WU8LDmW7bojfupeihvw8ru0XoriN46QYLMnopjnSCfEzLS2OL8FnMI4 tkU9p3XDVB+25dZ+hMyDuPTGxLi/+XMiDhHKIJYuOY8Q3FHNP85P8LSLLpg0QuwJ6C KPQk41RFTMVfQ== 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=1624115405; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=Jg15KuLDc9Pd0cjkQKGHl1QMNvmHzgPBIjg4oyLTNo8=; b=r2rW+IYKk1kqEW8yEKuJ/zztPg9JFsXHzfxsmDF+xUzZGuAetsNfYbXxDU0S48tcwLBQWm 6rNOT9FJHF6KRi71WqlJNY5xHV2m+AwOKtSZCgMVske5bkBie5aMtCm75WQ5LxtJ43AlnH zW6uGS5OlKroJKWROuPynGvqzrJrgzyiyf3Qxuh+ubj5oWfB8opJfB5CDuZPT1ewFfffqN UbcH5m63NGvdbl0+6iEfQeng/nAN8KWO0fZm99gG+cCHA2vn98g/PGJGiIcrAo7YinRX0e b5Vd9UDgQkSFGYhHQ8u1VuQ/50eDal7E8dyqxvauARHAcsDNcx1psRYUPfU/TQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115405; a=rsa-sha256; cv=none; b=NEmkXud8haiXuiN+U0Tp/yi4Y7KbKZoYnn+j5sy5phj2UNS7kvJe7Aqbx0u/BitYLaHh7q niP818uugKLTbSG60D5UlanfZsLbOt6F+UnMtD6+9aHe/bLUYsJPu1cZloey33bwEzlVd8 NusO9VwagQp7FghOOTBPH+fVHodgMG19nz8hMqn66ODLO8FPccO97/u4qANQ/Ra1vLmMCN OFfcpmLTJUeV/DHQ+DFc2HcB8DGGJKM95678HcIXS1EP0OASrOcZG5aQRpexsiOWk9i1uj zDY4YK6Ym0K7K2TC0offK4raaiYt+DWA92fUdACtWk7P84zLXLKkO2tGWCmUGA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=sKa08S9e; 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: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=sKa08S9e; 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: 9E63A21F2B X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: KrGUPphkHdDb %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 -- 2.32.0