From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4DiwEyR/x2CwbAAAgWs5BA (envelope-from ) for ; Mon, 14 Jun 2021 18:09:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SApJDyR/x2CnOgAAB5/wlQ (envelope-from ) for ; Mon, 14 Jun 2021 16:09:08 +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 0494035053 for ; Mon, 14 Jun 2021 18:09:08 +0200 (CEST) Received: from localhost ([::1]:55556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsp98-0004Uw-Lc for larch@yhetil.org; Mon, 14 Jun 2021 12:09:06 -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: Content-Type: multipart/mixed; boundary="=-Apw7h0s7ASZTl8633UF+" 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+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=1623686948; 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=QW0tjiTW+CkVuxysVui/WJvw5+glTVXo+zI/KaKqgX4=; b=TSNCYVpwiEFBFigRW6Chp4zC14UkB4ktV7uUN7+rJfVP3l+w7pNwG2kwT28yidzzBmax/K IpvfP6RFPh+C2JE5mlobqGzZZ8vyooGC7QGNO2nhiTer1+Bw41vS4rkJmXZSfEwMmPWARF C8rrx0WNqfnxLv+aeRU0HGLbX1Uu+z7EGL+HUleVqjpQaFfCP7dvz/wpEjsLJRADu93qcd dPmXFsaWwfuvO1kZ8cNW6NMYCOZwEr7SN/MicYwWFTR/l9CFbgx0/OkSJ6nVjryVPZliC8 5oqm2eh/LmGXdM5P5H0kMTHXPqnNZYNZQ0BaBW9xpJr+nBW8MiJMIgKE96TTlQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1623686948; a=rsa-sha256; cv=none; b=JPzpsDxg+GbiLsUP+2L+SubawLV8w3oKDrN/GQPHaC7xdKMpZXuUW81AyngGCBlpsJJDOm iE96qmJtpzElwXN6jhDS6WcszNTOBVNJPdkNeUSF44qUEa3RbzmS6SEBk/sVf1e3r/e99b jGJ1FM3aYBqZEcQVHsZ2mwZWQdfjY/+U1amEBn65gYVF4GQ3klKkZTJ8j6iSNU4ARF3SYy zXtVBTNULYvJYhBsJFGV9M2/O2VsXpDzU9fENnGdrPeHifB8riR05aZDH2LbnMVx8nHoja jHhy/tKfDT165jvxM+6pV5R4QiR/1QXnqKRt1pctkg+2OMO8sTaunOxaPQgp2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=TiJK7VkG; 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=TiJK7VkG; 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: 0494035053 X-Spam-Score: -1.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: 4Y5+ORFWztRP --=-Apw7h0s7ASZTl8633UF+ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit %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(-) --=-Apw7h0s7ASZTl8633UF+ Content-Disposition: attachment; filename="0026-bash-Fix-cross-compilation-build-error.patch" Content-Transfer-Encoding: 7bit Content-Type: text/x-patch; name="0026-bash-Fix-cross-compilation-build-error.patch"; charset="us-ascii" 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 --=-Apw7h0s7ASZTl8633UF+--