aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-06 11:55:36 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-06 12:01:39 +0200
commit3ffcad7df3ab8947010814f61b32ce14ea80e780 (patch)
tree30c66a3e9f53eb20fbac2d7098ed8b76e27884bd
parentf66be84d08b90a9ecf08f79c8156d072ad359c36 (diff)
downloadguix-3ffcad7df3ab8947010814f61b32ce14ea80e780.tar
guix-3ffcad7df3ab8947010814f61b32ce14ea80e780.tar.gz
build-self: Accomodate upgrades from May 2016 and earlier.
Reported by Paul Garlick <pgarlick@tourbillion-technology.com>. 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.
-rw-r--r--build-aux/build-self.scm10
1 files changed, 10 insertions, 0 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index f472724f18..f91b43987a 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"))