me
/
guix
Archived
1
0
Fork 0
Code

gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’ 

A recent change makes the ‘perl’ package explicitly reference input
“coreutils” or “coreutils-minimal” by label in the ‘setup-configure’ phase
but the ‘perl-boot0’ package, which uses ‘%boot0-inputs’ as its input list,
doesn’t have such input on non-x86-linux systems. This causes the build of
‘perl-boot0’ to fail on those systems.

Therefore use ‘search-input-file’ to find ‘bin/pwd’ and avoid referencing
the input label.

* gnu/packages/perl.scm (perl)[arguments]<#:phases>: Use
‘search-input-file’ to find ‘bin/pwd’.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
master
Thiago Jung Bauermann 2021-07-24 22:58:26 -03:00 committed by Efraim Flashner
parent b8894e8065
commit 52cc639403
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/perl.scm
View File

@ -124,18 +124,16 @@
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'setup-configure (add-before 'configure 'setup-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((coreutils (or (assoc-ref inputs "coreutils-minimal")
(assoc-ref inputs "coreutils"))))
;; Use the right path for `pwd'. ;; Use the right path for `pwd'.
(substitute* "dist/PathTools/Cwd.pm" (substitute* "dist/PathTools/Cwd.pm"
(("'/bin/pwd'") (("'/bin/pwd'")
(string-append "'" coreutils "/bin/pwd'"))) (string-append "'" (search-input-file inputs "bin/pwd") "'")))
;; Build in GNU89 mode to tolerate C++-style comment in libc's ;; Build in GNU89 mode to tolerate C++-style comment in libc's
;; <bits/string3.h>. ;; <bits/string3.h>.
(substitute* "cflags.SH" (substitute* "cflags.SH"
(("-std=c89") (("-std=c89")
"-std=gnu89"))))) "-std=gnu89"))))
,@(if (%current-target-system) ,@(if (%current-target-system)
`((add-after 'unpack 'unpack-cross `((add-after 'unpack 'unpack-cross
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)