benwoodcroft pushed a commit to branch core-updates in repository guix. commit 9f2989b6cc526b86c457c449dc14aeed0745d287 Author: Ben Woodcroft <donttrust...@gmail.com> Date: Mon Sep 19 21:11:19 2016 +1000
gnu: perl: Split configure phase. * gnu/packages/perl.scm (perl)[arguments]: Split 'configure' phase into 'setup-configure' and 'configure' phases. --- gnu/packages/perl.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0a26e51..f0c4e36 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -62,22 +62,24 @@ '(#:tests? #f #:phases (modify-phases %standard-phases + (add-before 'configure 'setup-configure + (lambda _ + ;; Use the right path for `pwd'. + (substitute* "dist/PathTools/Cwd.pm" + (("/bin/pwd") + (which "pwd"))) + + ;; Build in GNU89 mode to tolerate C++-style comment in libc's + ;; <bits/string3.h>. + (substitute* "cflags.SH" + (("-std=c89") + "-std=gnu89")) + #t)) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (libc (assoc-ref inputs "libc"))) - ;; Use the right path for `pwd'. - (substitute* "dist/PathTools/Cwd.pm" - (("/bin/pwd") - (which "pwd"))) - - ;; Build in GNU89 mode to tolerate C++-style comment in libc's - ;; <bits/string3.h>. - (substitute* "cflags.SH" - (("-std=c89") - "-std=gnu89")) - (zero? (system* "./Configure" (string-append "-Dprefix=" out)