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 MF7oFS6GJmFLmwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:04:30 +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 2HJ7ES6GJmF2dAAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:04:30 +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 178DF2BCBD for ; Wed, 25 Aug 2021 20:04:30 +0200 (CEST) Received: from localhost ([::1]:56446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGH-00008d-0G for larch@yhetil.org; Wed, 25 Aug 2021 14:04:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxFt-0007uF-T1 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxFt-0000pQ-JD for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxFt-0002nT-Ek for guix-patches@gnu.org; Wed, 25 Aug 2021 14:04:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 05/52] gnu: perl: Find 'bash' when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:04:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991463810575 (code B ref 50201); Wed, 25 Aug 2021 18:04:05 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:03:58 +0000 Received: from localhost ([127.0.0.1]:47677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFl-0002kP-Gd for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:57 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:50758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFV-0002fx-Nm for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:43 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id lu3d2500J0mfAB406u3hTD; Wed, 25 Aug 2021 20:03:41 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:02:45 +0200 Message-Id: <20210825180332.5720-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914621; bh=Eav3gzMnHi0An8gBIihU4DSjcrMcDTRwRnsorm4NHbg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UwMxTI7Sk+JKM2x6v89Thzc7ybhN99Kkir5C5DQ5s0wI35YTYBG74YgVerywnNf6/ 3IZa/ZXGNzvkpV+97so/JaHDwwRbVksj3ujC4WxwiouztIK1SfvcIHHt5L7Dztmln4 jmFLQAzQoqu0Kubhqa3nCD2Wp8FVnYc1Gz5L/b4CyKi1taJIiRxphtguGSWVktLtYC buR8giFohVCdNsySW3GlK+sjIvbo5omTKP9CzygA0AF+8oJEn6asbANL+W71pcr4eO X3HhRZZgGG4fR3HWC06QI5N2HpxhakJP5rUf4+RCVc1SC1Nxc6UcWZ+fM0mDGo0MDd 5X6QPjZUlEQXw== 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=1629914670; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=Eav3gzMnHi0An8gBIihU4DSjcrMcDTRwRnsorm4NHbg=; b=euWBFQRjFVd6YHCSxKKtAB6AnSBtIBrqqU6aBV1oK9+66u6McpsxSOopZhy1e3L2l9kDYE 3cHBmL5TWi4zjRLdY0spq6XnG3va4bBgbK9o2CimIq+pRwCvd9kAMx5JoTwUc6GaRkB2pl 4R1XdoZeSx8pN2Y5AOxdDWyqKC/trumcRWT5doKH6d0miw99qFBQV3N199KQFBkqR6Q3gY fBwXpvqpObmtjAzvDEIcTLXcBjbHYGFlLRnZ7C1QpxS4vbq6EtLvT5HwbhP/GDsjYd9SU+ O8AesuWGPOtvHPIW65FUSbW/FqoNL++QXSqmDup7yuDO3M+BqB061w9dS+t0jA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914670; a=rsa-sha256; cv=none; b=BreWud2Zh/DVPVVCOicjbgH7vuiUXEjUDCOM7XOT9n8DQcB+mFS0R93QWeDJuAuoMt7ZQe sBmc5xIF+r7fRQM/1s/zM79wcL575/WrdWqaAt1k23kZyUI6WvDA7oRbSFhi4PlDMga+rp VZnXHam/h0Ovm23ZeVw3F53kji4jxBF7JlO+M8i9y3d5SpuRqM51vHKYNxcm/FDWFlHEu/ HNQCPCehT+BiaYuZAHija8H1VyJ1JkKuLCbwqOdOnZlq6hvGRXt+znPaTplWIUfVEtb0X9 4gKB1ezUOh6eaj5XdQYjgIBVsaNR1dyc2reXIY/TNCJJfKCWYxLVdEqvnzubgg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=UwMxTI7S; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=UwMxTI7S; 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: 178DF2BCBD X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: GyyIGLoDum1B * gnu/packages/perl.scm (perl)[arguments]<#:phases>{unpack-cross}: Search for "bash" with 'search-input-file' instead of 'assoc-ref'. (perl)[arguments]<#:phases>{configure}: Search for "bash-minimal" instead of "bash". --- gnu/packages/perl.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 99a152e0ab..c548fe3350 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,15 +143,15 @@ (rename-file "Artistic" "Artistic.perl") (rename-file "Copying" "Copying.perl") (copy-recursively cross-checkout ".")) - (let ((bash (assoc-ref inputs "bash"))) + (let ((bash (search-input-file inputs "bin/bash"))) (substitute* '("Makefile.config.SH" "cnf/config.guess" "cnf/config.sub" "cnf/configure" "cnf/configure_misc.sh" "miniperl_top") - (("! */bin/sh") (string-append "! " bash "/bin/bash")) - ((" /bin/sh") (string-append bash "/bin/bash"))) + (("! */bin/sh") (string-append "! " bash)) + ((" /bin/sh") bash)) (substitute* '("ext/Errno/Errno_pm.PL") (("\\$cpp < errno.c") "$Config{cc} -E errno.c"))))) (replace 'configure @@ -168,7 +169,7 @@ (lambda (x) (or (string-prefix? "-d" x) (string-prefix? "-Dcc=" x)))) configure-flags))) - (bash (assoc-ref inputs "bash"))) + (bash (assoc-ref inputs "bash-minimal"))) (format (current-error-port) "running ./configure ~a\n" (string-join configure-flags)) -- 2.33.0