Subject: [PATCH 05/52] gnu: perl: Find 'bash' when cross-compiling.

From: Maxime Devos <[email-masked]>
Date: Wed, 25 Aug 2021 20:02:45 +0200

* 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 <[email-masked]>
 ;;; Copyright © 2021 Xinglu Chen <[email-masked]>
 ;;; Copyright © 2021 Raghav Gururajan <[email-masked]>
+;;; Copyright © 2021 Maxime Devos <[email-masked]>
 ;;;
 ;;; 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