From patchwork Wed Aug 25 18:02:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32255 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 3655F27BBE1; Wed, 25 Aug 2021 19:04:37 +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_H2,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 525AB27BBE3 for ; Wed, 25 Aug 2021 19:04:36 +0100 (BST) Received: from localhost ([::1]:56446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxGN-00008d-DM for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:04:35 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))