janneke pushed a commit to branch wip-bootstrap in repository guix. commit 100e2d2a929bc372a123184b68f209d0193e2c62 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Sep 8 12:54:14 2018 +0200
gnu: perl-boot0: Remove bootstrap leaks. * gnu/packages/commencement.scm (perl-boot0): Remove bootstrap leaks. Disable validate-runpath. --- gnu/packages/commencement.scm | 56 ++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7ad8ced..80e8684 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1893,33 +1893,35 @@ exec " gcc "/bin/" program (native-inputs `())))) (define perl-boot0 - (let ((perl (package - (inherit perl) - (name "perl-boot0") - (arguments - ;; At the very least, this must not depend on GCC & co. - (let ((args `(#: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)))))))) - (package-with-bootstrap-guile - (package-with-explicit-inputs perl - (%boot0-inputs) - (current-source-location) - #:guile %bootstrap-guile)))) + (package-with-bootstrap-guile + (package + (inherit perl) + (name "perl-boot0") + (arguments + `(#:guile ,%bootstrap-guile + #:implicit-inputs? #f + #:validate-runpath? #f + ;; At the very least, this must not depend on GCC & co. + #: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))))) + (inputs (%boot0-inputs)) + (propagated-inputs '()) + (native-inputs '())))) (define bison-boot0 ;; This Bison is needed to build MiG so we need it early in the process.