From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gG+CJDLWzGBzYgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 19:21:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wAALIDLWzGCASwAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 17:21:54 +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 23CE61371C for ; Fri, 18 Jun 2021 19:21:54 +0200 (CEST) Received: from localhost ([::1]:51882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luIBl-0001DC-4O for larch@yhetil.org; Fri, 18 Jun 2021 13:21:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luIA9-0007wq-FN for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luIA9-0004FQ-4f for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luIA9-0004uE-0w for guix-patches@gnu.org; Fri, 18 Jun 2021 13:20:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v3 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: Fri, 18 Jun 2021 17:20:12 +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.162403679318568 (code B ref 49025); Fri, 18 Jun 2021 17:20:12 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 17:19:53 +0000 Received: from localhost ([127.0.0.1]:58058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9o-0004pP-U7 for submit@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:53 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:34838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luI9E-0004j5-45 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 13:19:16 -0400 Received: from localhost.localdomain ([213.119.219.214]) by andre.telenet-ops.be with bizsmtp id JhK5250094e8Tal01hKFdY; Fri, 18 Jun 2021 19:19:15 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 19:16:20 +0200 Message-Id: <20210618171631.20534-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618171631.20534-1-maximedevos@telenet.be> References: <20210618171631.20534-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=1624036755; bh=Jg15KuLDc9Pd0cjkQKGHl1QMNvmHzgPBIjg4oyLTNo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=Whafk8vV5dybHyvXIYDi88xGSYYJVao/QasbAnTi8xRqr9z7Aj5kDP+ZYgNagO8e/ 2M9tMf08wd78Y8wvdoon1wvMO8nWQ0700Szhqo37qvF0zxzLMYnYFh8ms8/B1StJmL QpX58wrmBrj0hB5Nlgd7rdqq2eM5ciKYBK0RjUMHDfn4SkuVNjF+QyeJpI6ejCtZjq rin3du9+H1YkuCE1KS74/RN9QDM0XyXoZFWa9WwjcibXKFmuDA58cWTTpmfSLmr9XX 5h9z754/w6FJaqyun2DlUoW+QcV03qzYGSkgkuukUKMqExfwqKhajKozDYDD0E+MEO +qLB31B3WihVQ== 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+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=1624036914; h=from:from:sender:sender:reply-to: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=uP5R0zyyKcyV8wp+YsQuEPLYKBZ3VKE86f5UEdcnloxQwMjH3c92FIM/iRkhWIZjqckcfn ntFjnt8Fj4E7MM5KwYjI4MlYIwjy/uZokzeKrvKWOEhmQsXZN9/TYE3ikXLxk+Wh4lLnx6 rgaxyMA7HmCT7g9t5KLJLW/oseoONeZSQUvuhJ0u7sAIkGnW9qqoM5xuctYYQRaYfziIjK ClTKTIPphwp5Xgx590bQKz2LdNAPgAhl7H7wwOgx11N4Yy9UUhGaHiHYjBRnJrYxglBLRr 4tXtGevp3Gd5bX9wWU6yKQFNwxuKY3mk5vINZt6VGUjgJ4IJrHMNXYYtHElDow== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624036914; a=rsa-sha256; cv=none; b=i4PG+RpXi//aLBkQ2tBBPRYmPBg4uMDhe2upR+y5P2kU361Koh79W1PgaTrdszcRhTEFu9 e5Xbg5eeju/fsJDBZSVH3UL/L31HYBCdqZ85rdKNqHq1Y6q+cGydcBfo/BUhblLhSh6URt PUZpN4H7yl/TNif/Z5zoUUqL6yoBX1fD4GhkqghgLGd5zhKdqfj8WOoSKpoUm+fXBaVIU7 HbKoYzd89NVxTOyKmA5DMy6IAx2dUmJ41sk9YMdgf0bPOAPDYBHZQPksDO61O739k47Cab TV7ygHzemGUp031ueEU/ME1MtvFEkiEgHlwkyEAftVP7UdsqvcErYfZJJV/rAg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Whafk8vV; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Whafk8vV; 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: 23CE61371C X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: QfFRnatesYcZ %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