01/01: build-self: Accomodate upgrades from May 2016 and earlier.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 3ffcad7df3ab8947010814f61b32ce14ea80e780
Author: Ludovic Courtès <address@hidden>
Date:   Thu Sep 6 11:55:36 2018 +0200

    build-self: Accomodate upgrades from May 2016 and earlier.
    
    Reported by Paul Garlick <address@hidden>.
    
    Fixes a bug whereby "old" Guix instances (before mid-May 2018) would
    fail to pull to current master.
    
    Specifically, Paul reported being unable to upgrade from
    6f84dc4314cd84550d9fc7e7afa11c495edc45a5 (a commit that predates that
    addition of the 'bootstrap' phase on gnu-build-system on 'master' and
    that also predates the new 'guix pull'.)
    
    * build-aux/build-self.scm (guile-gcrypt)[arguments]: New field.
---
 build-aux/build-self.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index f472724..f91b439 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -216,6 +216,16 @@ person's version identifier."
                    "1gir7ifknbmbvjlql5j6wzk7bkb5lnmq80q59ngz43hhpclrk5k3"))
                  (file-name (string-append name "-" version ".tar.gz"))))
        (build-system gnu-build-system)
+       (arguments
+        ;; The 'bootstrap' phase appeared in 'core-updates', which was merged
+        ;; into 'master' ca. June 2018.
+        '(#:phases (modify-phases %standard-phases
+                     (delete 'bootstrap)
+                     (add-before 'configure 'bootstrap
+                       (lambda _
+                         (unless (zero? (system* "autoreconf" "-vfi"))
+                           (error "autoreconf failed"))
+                         #t)))))
        (native-inputs
         `(("pkg-config" ,(specification->package "pkg-config"))
           ("autoconf" ,(specification->package "autoconf"))