From 5fc78abc7f8991ddda91c4a57a0701dd340e1027 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 24 Aug 2021 09:44:27 +0200 Subject: gnu: perl: Find 'bash' when cross-compiling. * 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 62b9c71fd5..4295233c04 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)) -- cgit v1.2.3