[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: bootstrap: perl-boot0: Actually look at args.
From: |
Jan Nieuwenhuizen |
Subject: |
01/01: bootstrap: perl-boot0: Actually look at args. |
Date: |
Tue, 18 Sep 2018 17:12:32 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit d0c8e5ee25e17366f50907f90a3e0d362ae9b02e
Author: Jan Nieuwenhuizen <address@hidden>
Date: Tue Sep 18 23:09:57 2018 +0200
bootstrap: perl-boot0: Actually look at args.
* gnu/packages/commencement.scm (perl-boot0): Actually look at args.
---
gnu/packages/commencement.scm | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 4ab237a..98835af 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1855,21 +1855,22 @@ exec " gcc "/bin/" program
(let ((args `(#:validate-runpath? #f
#:disallowed-references
,(list %bootstrap-binutils))))
- (substitute-keyword-arguments (package-arguments perl)
- ((#:phases phases)
- `(modify-phases ,phases
- ;; Pthread support is missing in the bootstrap
compiler
- ;; (broken spec file), so disable it.
- (add-before 'configure 'disable-pthreads
- (lambda _
- (substitute* "Configure"
- (("^libswanted=(.*)pthread" _ before)
- (string-append "libswanted=" before)))
- #t))))
- ;; Do not configure with '-Dusethreads' since pthread
- ;; support is missing.
- ((#:configure-flags configure-flags)
- `(delete "-Dusethreads" ,configure-flags))))))))
+ `(,@args
+ ,@(substitute-keyword-arguments (package-arguments perl)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; Pthread support is missing in the bootstrap
compiler
+ ;; (broken spec file), so disable it.
+ (add-before 'configure 'disable-pthreads
+ (lambda _
+ (substitute* "Configure"
+ (("^libswanted=(.*)pthread" _ before)
+ (string-append "libswanted=" before)))
+ #t))))
+ ;; Do not configure with '-Dusethreads' since pthread
+ ;; support is missing.
+ ((#:configure-flags configure-flags)
+ `(delete "-Dusethreads" ,configure-flags)))))))))
(package-with-bootstrap-guile
(package-with-explicit-inputs perl
%boot0-inputs