From 2ee1cce324bd200096adfa73cfe6a3fe3a4e87de Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Jun 2020 15:18:34 +0200 Subject: build-system/gnu: Remove 'autoreconf' phase from 'gnu-dist'. This has been superseded by the 'bootstrap' phase added in 189be331acfda1c242a9c85fca8d2a0356742f48. * guix/build/gnu-dist.scm (autoreconf): Remove. (%dist-phases): Remove it. --- guix/build/gnu-dist.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'guix/build') diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index bf1c63cb85..f82c721da7 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015 Ludovic Courtès +;;; Copyright © 2013, 2015, 2020 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. @@ -33,23 +33,6 @@ (define* (copy-source #:key source #:allow-other-keys) (copy-recursively source ".")) -(define* (autoreconf #:rest args) - (letrec-syntax ((try-files (syntax-rules (else) - ((_ (else fallback ...)) - (begin fallback ...)) - ((_ file files ... (else fallback ...)) - (if (file-exists? file) - (begin - (format #t "bootstrapping with `~a'...~%" - file) - (invoke (string-append "./" file))) - (try-files files ... - (else fallback ...))))))) - (try-files "bootstrap" "bootstrap.sh" "autogen" "autogen.sh" - (else - (format #t "bootstrapping with `autoreconf'...~%") - (invoke "autoreconf" "-vfi"))))) - (define* (build #:key build-before-dist? make-flags (dist-target "distcheck") #:allow-other-keys #:rest args) @@ -85,7 +68,6 @@ (delete 'strip) (replace 'install install-dist) (replace 'build build) - (add-before 'configure 'autoreconf autoreconf) (replace 'unpack copy-source))) ;;; gnu-dist.scm ends here -- cgit v1.2.3