aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Woodcroft <donttrustben@gmail.com>2016-09-19 21:11:19 +1000
committerBen Woodcroft <donttrustben@gmail.com>2016-09-25 10:09:00 +1000
commit9f2989b6cc526b86c457c449dc14aeed0745d287 (patch)
treea7ddfa9253446edbfc458461096d678cb93ed537
parentb5b5105c3d1dacaf87a3c786270860cf636b0a52 (diff)
downloadpatches-9f2989b6cc526b86c457c449dc14aeed0745d287.tar
patches-9f2989b6cc526b86c457c449dc14aeed0745d287.tar.gz
gnu: perl: Split configure phase.
* gnu/packages/perl.scm (perl)[arguments]: Split 'configure' phase into 'setup-configure' and 'configure' phases.
-rw-r--r--gnu/packages/perl.scm24
1 files changed, 13 insertions, 11 deletions
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 0a26e51dfc..f0c4e36422 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)