nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/gnu: Add 'bootstrap' phase. 

This factorizes what has become a widespread idiom.

* guix/build/gnu-build-system.scm (%bootstrap-scripts): New variable.
(bootstrap): New procedure.
(%standard-phases): Add it after 'unpack'.
* guix/build/ant-build-system.scm (%standard-phases): Delete 'bootstrap.
* guix/build/asdf-build-system.scm (%standard-phases/source)
(%standard-phases): Likewise.
* guix/build/cargo-build-system.scm (%standard-phases): Likewise.
* guix/build/cmake-build-system.scm (%standard-phases): Likewise.
* guix/build/dub-build-system.scm (%standard-phases): Likewise.
* guix/build/emacs-build-system.scm (%standard-phases): Likewise.
* guix/build/font-build-system.scm (%standard-phases): Likewise.
* guix/build/go-build-system.scm (%standard-phases): Likewise.
* guix/build/haskell-build-system.scm (%standard-phases): Likewise.
* guix/build/minify-build-system.scm (%standard-phases): Likewise.
* guix/build/ocaml-build-system.scm (%standard-phases): Likewise.
* guix/build/perl-build-system.scm (%standard-phases): Likewise.
* guix/build/python-build-system.scm (%standard-phases): Likewise.
* guix/build/r-build-system.scm (%standard-phases): Likewise.
* guix/build/ruby-build-system.scm (%standard-phases): Likewise.
* guix/build/scons-build-system.scm (%standard-phases): Likewise.
* guix/build/texlive-build-system.scm (%standard-phases): Likewise.
* guix/build/waf-build-system.scm (%standard-phases): Likewise.
* gnu/packages/audio.scm (faad2)[arguments]: Replace 'bootstrap.
(soundtouch, cuetools, bluez-alsa): Remove 'arguments'.
(cava)[arguments]: Replace 'bootstrap.
* gnu/packages/backup.scm (rdup): Remove 'bootstrap.
* gnu/packages/bioinformatics.scm (seek)[arguments]: Replace
'bootstrap.
* gnu/packages/bioinformatics.scm (htslib-for-sambamba): Remove
'arguments'.
* gnu/packages/ci.scm (hydra, cuirass): Remove 'bootstrap'.
* gnu/packages/crypto.scm (libb2): Remove #:phases.
* gnu/packages/databases.scm (guile-wiredtiger): Likewise.
* gnu/packages/debug.scm (stress-make): Remove 'bootstrap'.
* gnu/packages/documentation.scm (asciidoc): Likewise.
* gnu/packages/fontutils.scm (libuninameslist): Remove 'arguments'.
* gnu/packages/ftp.scm (weex): Remove 'arguments'.
* gnu/packages/game-development.scm (ois): Remove 'arguments'.
* gnu/packages/games.scm (pioneer): Remove 'bootstrap.
* gnu/packages/gnome.scm (vte-ng, byzanz): Replace 'bootstrap.
(arc-theme): Remove 'arguments'.
(faba-icon-theme): Remove 'bootstrap.
(arc-icon-theme): Remove 'arguments'.
* gnu/packages/gnunet.scm (guile-gnunet): Likewise.
* gnu/packages/gtk.scm (guile-rsvg): Likewise.
* gnu/packages/guile.scm (mcron2): Remove 'bootstrap.
(guile-bash): Remove #:phases.
(guile-git): Remove 'bootstrap.
(guile-syntax-highlight): Remove 'arguments'.
(guile-sjson): Likewise.
* gnu/packages/java.scm (classpath-devel): Remove 'bootstrap.
* gnu/packages/kodi.scm (libdvdnav/kodi)
(libdvdread/kodi, libdvdcss/kodi): Likewise.
* gnu/packages/libreoffice.scm (hunspell): Remove 'arguments'.
* gnu/packages/libusb.scm (hidapi): Likewise.
* gnu/packages/linux.scm (bridge-utils): Rename 'bootstrap' to
'patch-stuff'; move it before 'bootstrap', without autoreconf
invocation.
(eudev): Rename 'bootstrap' to 'patch-file-names', without 'autogen.sh'
invocation; move it before 'bootstrap.
(gpm): Replace 'bootstrap'.
(f2fs-tools): Remove 'arguments'.
(rng-tools): Remove #:phases.
* gnu/packages/messaging.scm (hexchat): Rename 'bootstrap' to
'copy-intltool-makefile'; remove "autoreconf" invocation and move before
'bootstrap'.
(libmesode): Remove 'arguments'.
(libstrophe): Likewise.
* gnu/packages/microcom.scm (microcom): Likewise.
* gnu/packages/networking.scm (libnet): Remove 'bootstrap.
* gnu/packages/onc-rpc.scm (libnsl): Remove 'arguments'.
* gnu/packages/package-management.scm (guix): Replace 'bootstrap.
* gnu/packages/sawfish.scm (librep): Remove 'arguments'.
* gnu/packages/version-control.scm (findnewest): Likewise.
* gnu/packages/video.scm (liba52, handbrake, motion): Replace
'bootstrap.
* gnu/packages/web.scm (fcgiwrap): Remove #:phases.
(tidy): Replace 'bootstrap.
(gumbo-parser): Remove #:phases.
* gnu/packages/wget.scm (wget2): Replace 'bootstrap.
* gnu/packages/wm.scm (i3lock-color): Remove #:phases.
* gnu/packages/xdisorg.scm (xclip): Likewise.
* gnu/packages/xml.scm (libxls): Replace 'bootstrap'.
* gnu/packages/xorg.scm (xf86-video-freedreno)
(xf86-video-intel): Remove #:phases.
* gnu/packages/zile.scm (zile-on-guile): Replace 'bootstrap.
This commit is contained in:
Ludovic Courtès 2018-03-11 21:46:30 +01:00
parent 5c6391b33a
commit 189be331ac
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
55 changed files with 112 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/audio.scm
View File

@ -1090,7 +1090,7 @@ also play midifiles using a Soundfont.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
(substitute* "bootstrap" (("\r\n") "\n")) (substitute* "bootstrap" (("\r\n") "\n"))
(zero? (system* "sh" "bootstrap"))))))) (zero? (system* "sh" "bootstrap")))))))
@ -2476,12 +2476,6 @@ Tracker 3 S3M and Impulse Tracker IT files.")
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool) ("libtool" ,libtool)
("file" ,file))) ("file" ,file)))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap")))))))
(home-page "http://www.surina.net/soundtouch/") (home-page "http://www.surina.net/soundtouch/")
(synopsis (synopsis
"Audio processing library for changing tempo, pitch and playback rate") "Audio processing library for changing tempo, pitch and playback rate")
@ -2884,12 +2878,6 @@ point audio data.")
"01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4")))) "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; The source tarball is not bootstrapped. ;; The source tarball is not bootstrapped.
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vfi")))))))
;; Bootstrapping tools
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -3102,12 +3090,6 @@ mixers.")
(base32 (base32
"1qinf41wl2ihx54zmmhanycihwjkn7dn1cicq6pp4rqbiv79b95x")))) "1qinf41wl2ihx54zmmhanycihwjkn7dn1cicq6pp4rqbiv79b95x"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -3327,7 +3309,7 @@ representations.")
(list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib))) (list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))
(invoke "sh" "autogen.sh"))) (invoke "sh" "autogen.sh")))

3
gnu/packages/backup.scm
View File

@ -278,9 +278,6 @@ random access nor for in-place modification.")
`(#:parallel-build? #f ;race conditions `(#:parallel-build? #f ;race conditions
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "autoreconf")))
(add-before 'build 'qualify-inputs (add-before 'build 'qualify-inputs
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; This script is full of pitfalls. Fix some that particularly ;; This script is full of pitfalls. Fix some that particularly

11
gnu/packages/bioinformatics.scm
View File

@ -4645,9 +4645,9 @@ distribution, coverage uniformity, strand specificity, etc.")
"Data2DB" "Data2DB"
"PCL2Bin"))) "PCL2Bin")))
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
(zero? (system* "bash" "gen_auto")))) (invoke "bash" "gen_auto")))
(add-after 'build 'build-additional-tools (add-after 'build 'build-additional-tools
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(every (lambda (dir) (every (lambda (dir)
@ -10704,13 +10704,6 @@ droplet sequencing. It has been particularly tailored for Drop-seq.")
(sha256 (sha256
(base32 (base32
"0g38g8s3npr0gjm9fahlbhiskyfws9l5i0x1ml3rakzj7az5l9c9")))) "0g38g8s3npr0gjm9fahlbhiskyfws9l5i0x1ml3rakzj7az5l9c9"))))
(arguments
(substitute-keyword-arguments (package-arguments htslib)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif"))))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

5
gnu/packages/ci.scm
View File

@ -147,9 +147,6 @@
(string-append "--docdir=" %output (string-append "--docdir=" %output
"/doc/hydra-" ,version))) "/doc/hydra-" ,version)))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after
'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-before (add-before
'check 'check-setup 'check 'check-setup
(lambda _ (setenv "LOGNAME" "test.log"))) (lambda _ (setenv "LOGNAME" "test.log")))
@ -221,8 +218,6 @@ their dependencies.")
(substitute* "build-aux/git-version-gen" (substitute* "build-aux/git-version-gen"
(("#!/bin/sh") (string-append "#!" (which "sh")))) (("#!/bin/sh") (string-append "#!" (which "sh"))))
#t)) #t))
(add-after 'patch-/bin/sh 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap"))))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'cuirass' command to refer to the right modules. ;; Wrap the 'cuirass' command to refer to the right modules.

7
gnu/packages/crypto.scm
View File

@ -645,12 +645,7 @@ data on your platform, so the seed itself will be as random as possible.
;; fat only checks for Intel optimisations ;; fat only checks for Intel optimisations
'("--enable-fat") '("--enable-fat")
'()) '())
"--disable-native") ; don't optimise at build time. "--disable-native"))) ;don't optimise at build time
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "autogen.sh"))))))
(home-page "https://blake2.net/") (home-page "https://blake2.net/")
(synopsis "Library implementing the BLAKE2 family of hash functions") (synopsis "Library implementing the BLAKE2 family of hash functions")
(description (description

9
gnu/packages/databases.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2017 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2016 David Thompson <davet@gnu.org>
@ -1613,12 +1613,7 @@ trees (LSM), for sustained throughput under random insert workloads.")
#:configure-flags #:configure-flags
(list (string-append "--with-libwiredtiger-prefix=" (list (string-append "--with-libwiredtiger-prefix="
(assoc-ref %build-inputs "wiredtiger"))) (assoc-ref %build-inputs "wiredtiger")))
#:make-flags '("GUILE_AUTO_COMPILE=0") #:make-flags '("GUILE_AUTO_COMPILE=0")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "bootstrap"))))))
;; TODO: Remove microkanren.scm when we have a separate package ;; TODO: Remove microkanren.scm when we have a separate package
;; for it. ;; for it.
(native-inputs (native-inputs

5
gnu/packages/debug.scm
View File

@ -299,10 +299,7 @@ down the road.")
(which "sh")))))) (which "sh"))))))
(add-before 'configure 'repack-make (add-before 'configure 'repack-make
(lambda _ (lambda _
(zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir)))) (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir))))))))
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi"))))))))
(home-page "https://github.com/losalamos/stress-make") (home-page "https://github.com/losalamos/stress-make")
(synopsis "Expose race conditions in Makefiles") (synopsis "Expose race conditions in Makefiles")
(description (description

5
gnu/packages/documentation.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
@ -59,9 +59,6 @@
`(#:tests? #f ; no 'check' target `(#:tests? #f ; no 'check' target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "autoconf")))
;; Some XML-related binaries are required for asciidoc's proper usage. ;; Some XML-related binaries are required for asciidoc's proper usage.
;; Without these, asciidoc fails when parsing XML documents, either ;; Without these, asciidoc fails when parsing XML documents, either
;; reporting a missing "xmllint" binary or, when passed the ;; reporting a missing "xmllint" binary or, when passed the

5
gnu/packages/fontutils.scm
View File

@ -494,11 +494,6 @@ smooth contours with constant curvature at the spline joins.")
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vi")))))))
(synopsis "Unicode names and annotation list") (synopsis "Unicode names and annotation list")
(description (description
"LibUniNamesList holds www.unicode.org Nameslist.txt data which can be "LibUniNamesList holds www.unicode.org Nameslist.txt data which can be

7
gnu/packages/ftp.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -156,11 +156,6 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and
`(("automake" ,automake) `(("automake" ,automake)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("gettext" ,gettext-minimal))) ("gettext" ,gettext-minimal)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vfi")))))))
(home-page "http://weex.sourceforge.net/") (home-page "http://weex.sourceforge.net/")
(synopsis "Non-interactive client for FTP synchronization") (synopsis "Non-interactive client for FTP synchronization")
(description (description

7
gnu/packages/game-development.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -950,11 +950,6 @@ painted with a mouse.")
(base32 (base32
"0w0pamjc3vj0jr718hysrw8x076fq6n9rd6wcb36sn2jd0lqvi98")))) "0w0pamjc3vj0jr718hysrw8x076fq6n9rd6wcb36sn2jd0lqvi98"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

4
gnu/packages/games.scm
View File

@ -5,7 +5,7 @@
;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net> ;;; Copyright © 2014 Sylvain Beucler <beuc@beuc.net>
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014, 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
@ -4633,8 +4633,6 @@ elements to achieve a simple goal in the most complex way possible.")
(string-append "PIONEER_DATA_DIR=" (string-append "PIONEER_DATA_DIR="
%output "/share/games/pioneer")) %output "/share/games/pioneer"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap"))))
(add-before 'bootstrap 'fix-lua-check (add-before 'bootstrap 'fix-lua-check
(lambda _ (lambda _
(substitute* "configure.ac" (substitute* "configure.ac"

21
gnu/packages/gnome.scm
View File

@ -2111,7 +2111,7 @@ editors, IDEs, etc.")
(arguments (arguments
`(#:configure-flags '("CXXFLAGS=-Wformat=0") `(#:configure-flags '("CXXFLAGS=-Wformat=0")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
(setenv "NOCONFIGURE" "true") (setenv "NOCONFIGURE" "true")
(zero? (system* "sh" "autogen.sh"))))))) (zero? (system* "sh" "autogen.sh")))))))
@ -6016,7 +6016,7 @@ documents and diagrams, playing media, scanning, and much more.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
;; The build system cleverly detects that we're not building from ;; The build system cleverly detects that we're not building from
;; a release tarball and turns on -Werror for GCC. ;; a release tarball and turns on -Werror for GCC.
@ -6349,12 +6349,6 @@ functionality and behavior.")
(base32 (base32
"0igxpngnkf1wpsg872a9jg3c9f5z8afm312yfbillz16mk8w39cw")))) "0igxpngnkf1wpsg872a9jg3c9f5z8afm312yfbillz16mk8w39cw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -6391,10 +6385,7 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
(substitute* '("Makefile.am") (substitute* '("Makefile.am")
(("\\$\\(DESTDIR\\)/usr/share") (("\\$\\(DESTDIR\\)/usr/share")
"$(datadir)")) "$(datadir)"))
#t)) #t)))))
(add-after 'patch-makefile.am 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
@ -6443,12 +6434,6 @@ simple and consistent.")
(base32 (base32
"1ya1cqvv8q847c0rpcg6apzky87q3h04y8jz5nmi52qk6kg8si0b")))) "1ya1cqvv8q847c0rpcg6apzky87q3h04y8jz5nmi52qk6kg8si0b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))

7
gnu/packages/gnunet.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
@ -321,11 +321,6 @@ kinds of basic applications for the foundation of a GNU internet.")
(base32 (base32
"0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w")))) "0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "autoreconf" "-vfi"))))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,(autoconf-wrapper)) ("autoconf" ,(autoconf-wrapper))
("automake" ,automake))) ("automake" ,automake)))

7
gnu/packages/gtk.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
@ -844,11 +844,6 @@ exceptions, macros, and a dynamic programming environment.")
"/share/guile/site/@GUILE_EFFECTIVE_VERSION@"))) "/share/guile/site/@GUILE_EFFECTIVE_VERSION@")))
(file-name (string-append name "-" version ".tar.gz")))) (file-name (string-append name "-" version ".tar.gz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

26
gnu/packages/guile.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2015, 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co> ;;; Copyright © 2016 Alex Sassmannshausen <alex@pompo.co>
@ -711,9 +711,6 @@ format is also supported.")
(("guile/site/2.0") (("guile/site/2.0")
"guile/site/2.2")) "guile/site/2.2"))
#t)) #t))
(add-after 'use-guile-2.2 'bootstrap
(lambda _
(invoke "autoreconf" "-vfi")))
(add-after 'install 'wrap-mcron (add-after 'install 'wrap-mcron
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Wrap the 'mcron' command to refer to the right ;; Wrap the 'mcron' command to refer to the right
@ -1824,12 +1821,7 @@ dictionary and suggesting spelling corrections.")
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:configure-flags
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap")))))
#:configure-flags
;; Add -I to match 'bash.pc' of Bash 4.4. ;; Add -I to match 'bash.pc' of Bash 4.4.
(list (string-append "CPPFLAGS=-I" (list (string-append "CPPFLAGS=-I"
(assoc-ref %build-inputs "bash:include") (assoc-ref %build-inputs "bash:include")
@ -1959,10 +1951,6 @@ is not available for Guile 2.0.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi"))))
;; FIXME: On i686, bytestructures miscalculates the offset ;; FIXME: On i686, bytestructures miscalculates the offset
;; of the 'old-file' and 'new-file' fields within the ;; of the 'old-file' and 'new-file' fields within the
;; '%diff-delta' structure. ;; '%diff-delta' structure.
@ -2010,11 +1998,6 @@ manipulate repositories of the Git version control system.")
(base32 (base32
"1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3")))) "1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "bootstrap")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -2041,11 +2024,6 @@ HTML (via SXML) or any other format for rendering.")
(base32 (base32
"1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3")))) "1mzmapln79vv10qxaggz9qwcdbag3jnrj19xx8bgkmxss8h03sv3"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap.sh")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

3
gnu/packages/java.scm
View File

@ -693,9 +693,6 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
"--disable-gjdoc") "--disable-gjdoc")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif"))))
(add-after 'unpack 'remove-unsupported-annotations (add-after 'unpack 'remove-unsupported-annotations
(lambda _ (lambda _
(substitute* (find-files "java" "\\.java$") (substitute* (find-files "java" "\\.java$")

6
gnu/packages/kodi.scm
View File

@ -146,8 +146,6 @@ generator library for C++.")
'(#:tests? #f '(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vif"))))
(delete 'configure) (delete 'configure)
(delete 'build) (delete 'build)
(replace 'install (replace 'install
@ -183,8 +181,6 @@ generator library for C++.")
'(#:tests? #f '(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vif"))))
(delete 'configure) (delete 'configure)
(delete 'build) (delete 'build)
(replace 'install (replace 'install
@ -220,8 +216,6 @@ generator library for C++.")
'(#:tests? #f '(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vif"))))
(delete 'configure) (delete 'configure)
(delete 'build) (delete 'build)
(replace 'install (replace 'install

8
gnu/packages/libreoffice.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
@ -704,12 +704,6 @@ Zoner Draw version 4 and 5.")
("libtool" ,libtool))) ("libtool" ,libtool)))
(inputs (inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(native-search-paths (list (search-path-specification (native-search-paths (list (search-path-specification
(variable "DICPATH") (variable "DICPATH")
(files '("share/hunspell"))))) (files '("share/hunspell")))))

6
gnu/packages/libusb.scm
View File

@ -330,12 +330,6 @@ devices.")
(base32 (base32
"0qdgyj9rgb7n0nk3ghfswrhzzknxqn4ibn3wj8g4r828pw07451w")))) "0qdgyj9rgb7n0nk3ghfswrhzzknxqn4ibn3wj8g4r828pw07451w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(inputs (inputs
`(("libusb" ,libusb) `(("libusb" ,libusb)
("udev" ,eudev))) ("udev" ,eudev)))

26
gnu/packages/linux.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
@ -1365,7 +1365,7 @@ Linux-based operating systems.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (add-before 'bootstrap 'patch-stuff
(lambda _ (lambda _
;; Fix "field ‘ip6’ has incomplete type" errors. ;; Fix "field ‘ip6’ has incomplete type" errors.
(substitute* "libbridge/libbridge.h" (substitute* "libbridge/libbridge.h"
@ -1378,7 +1378,7 @@ Linux-based operating systems.")
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;") (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;")) "$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
(zero? (system* "autoreconf" "-vf"))))) #t)))
#:tests? #f)) ; no 'check' target #:tests? #f)) ; no 'check' target
(home-page (home-page
@ -1996,14 +1996,13 @@ from the module-init-tools project.")
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'bootstrap (add-before 'bootstrap 'patch-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "man/make.sh" (substitute* "man/make.sh"
(("/usr/bin/xsltproc") (("/usr/bin/xsltproc")
(string-append (assoc-ref inputs "xsltproc") (string-append (assoc-ref inputs "xsltproc")
"/bin/xsltproc"))) "/bin/xsltproc")))
;; Manual pages are regenerated here. #t))
(zero? (system* "./autogen.sh"))))
(add-after 'install 'build-hwdb (add-after 'install 'build-hwdb
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and
@ -3097,7 +3096,7 @@ write access to exFAT devices.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
;; The tarball was not generated with 'make dist' so we ;; The tarball was not generated with 'make dist' so we
;; need to bootstrap things ourselves. ;; need to bootstrap things ourselves.
@ -3232,12 +3231,6 @@ from the btrfs-progs package. It is meant to be used in initrds.")
(base32 (base32
"1bir9ladb58ijlcvrjrq1fb1xv5ys50zdjaq0yzliib0apsyrnyl")))) "1bir9ladb58ijlcvrjrq1fb1xv5ys50zdjaq0yzliib0apsyrnyl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -3457,12 +3450,7 @@ The following service daemons are also provided:
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB.
#:configure-flags '("--without-nistbeacon") #:configure-flags '("--without-nistbeacon")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "sh" "autogen.sh")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

16
gnu/packages/messaging.scm
View File

@ -243,13 +243,13 @@ identi.ca and status.net).")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Release 2.12.4 wasn't properly bootstrapped. Later ones might be! ;; Release 2.12.4 wasn't properly bootstrapped. Later ones might be!
(add-after 'unpack 'bootstrap (add-before 'boostrap 'copy-intltool-makefile
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; This file is still required for autoreconf. ;; This file is still required for autoreconf.
(copy-file (string-append (assoc-ref inputs "intltool") (copy-file (string-append (assoc-ref inputs "intltool")
"/share/intltool/Makefile.in.in") "/share/intltool/Makefile.in.in")
"po/Makefile.in.in") "po/Makefile.in.in")
(zero? (system* "autoreconf" "-fiv"))))))) #t)))))
(synopsis "Graphical IRC Client") (synopsis "Graphical IRC Client")
(description (description
"HexChat lets you connect to multiple IRC networks at once. The main "HexChat lets you connect to multiple IRC networks at once. The main
@ -1365,12 +1365,6 @@ is also scriptable and extensible via Guile.")
(base32 (base32
"0iaj56fkd5bjvqpvq3324ni895rmbj1akbfqipjydnghfwaym4z6")))) "0iaj56fkd5bjvqpvq3324ni895rmbj1akbfqipjydnghfwaym4z6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'bootstrap
(lambda _
(zero? (system* "./bootstrap.sh")))))))
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
("openssl" ,openssl))) ("openssl" ,openssl)))
@ -1400,12 +1394,6 @@ manual SSL certificate verification.")
(base32 (base32
"1hzwdax4nsz0fncf5bjfza0cn0lc6xsf38y569ql1gg5hvwr6169")))) "1hzwdax4nsz0fncf5bjfza0cn0lc6xsf38y569ql1gg5hvwr6169"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-before 'configure 'bootstrap
(lambda _
(zero? (system* "./bootstrap.sh")))))))
(inputs (inputs
`(("expat" ,expat) `(("expat" ,expat)
("openssl" ,openssl))) ("openssl" ,openssl)))

6
gnu/packages/microcom.scm
View File

@ -39,12 +39,6 @@
(base32 (base32
"080ci5589bpyy5kcl51csmvpw9zysify189hw6awx69pi3cjnxly")))) "080ci5589bpyy5kcl51csmvpw9zysify189hw6awx69pi3cjnxly"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-i")))))))
(inputs `(("readline" ,readline))) (inputs `(("readline" ,readline)))
(native-inputs `(("automake" ,automake) (native-inputs `(("automake" ,automake)
("autoconf" ,autoconf))) ("autoconf" ,autoconf)))

2
gnu/packages/networking.scm
View File

@ -1529,8 +1529,6 @@ interface and a programmable text output for scripting.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (chdir "libnet") #t)) (lambda _ (chdir "libnet") #t))
(add-after 'chdir 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-vif"))))
(add-before 'build 'build-doc (add-before 'build 'build-doc
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
(zero? (apply system* "make" "-C" "doc" "doc" (zero? (apply system* "make" "-C" "doc" "doc"

8
gnu/packages/onc-rpc.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org>
;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017, 2018 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -113,12 +113,6 @@ universal addresses.")
(base32 (base32
"1y6kmxmv1difzvdhx7grqzw0j2v2b74mg4kjb803m8jcgkqqx8m5")))) "1y6kmxmv1difzvdhx7grqzw0j2v2b74mg4kjb803m8jcgkqqx8m5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(invoke "sh" "autogen.sh"))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)

2
gnu/packages/package-management.scm
View File

@ -142,7 +142,7 @@
(ice-9 rdelim)) (ice-9 rdelim))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
;; Make sure 'msgmerge' can modify the PO files. ;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po) (for-each (lambda (po)

7
gnu/packages/sawfish.scm
View File

@ -47,13 +47,6 @@
(base32 (base32
"1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8")))) "1bmcjl1x1rdh514q9z3hzyjmjmwwwkziipjpjsl301bwmiwrd8a8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
;; The 0.92.6 tarball was not produced by 'make dist'
;; and lacks generated files. Sadness.
(zero? (system* "autoreconf" "-vfi")))))))
(native-inputs (native-inputs
`(("makeinfo" ,texinfo) `(("makeinfo" ,texinfo)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)

7
gnu/packages/version-control.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
@ -1434,11 +1434,6 @@ output of the 'git' command.")
(base32 (base32
"1ydis4y0amkgfr4y60sn076f1l41ya2kn89kfd9fqf44f9ccgb5r")))) "1ydis4y0amkgfr4y60sn076f1l41ya2kn89kfd9fqf44f9ccgb5r"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
(home-page "https://github.com/0-wiz-0/findnewest/releases") (home-page "https://github.com/0-wiz-0/findnewest/releases")

7
gnu/packages/video.scm
View File

@ -205,8 +205,7 @@ old-fashioned output methods with powerful ascii-art renderer.")
(modify-phases %standard-phases (modify-phases %standard-phases
;; XXX We need to run ./bootstrap because of the build ;; XXX We need to run ./bootstrap because of the build
;; system fixes above. ;; system fixes above.
(add-after (replace 'bootstrap
'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "bootstrap"))))))) (lambda _ (zero? (system* "sh" "bootstrap")))))))
(home-page "http://liba52.sourceforge.net/") (home-page "http://liba52.sourceforge.net/")
(synopsis "ATSC A/52 stream decoder") (synopsis "ATSC A/52 stream decoder")
@ -2195,7 +2194,7 @@ supported players in addition to this package.")
`(#:tests? #f ;tests require Ruby and claim to be unsupported `(#:tests? #f ;tests require Ruby and claim to be unsupported
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'patch-source-shebangs 'bootstrap-gtk (replace 'bootstrap
;; Run bootstrap ahead of time so that shebangs get patched. ;; Run bootstrap ahead of time so that shebangs get patched.
(lambda _ (lambda _
(setenv "CONFIG_SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh"))
@ -2714,7 +2713,7 @@ It counts more than 100 plugins.")
("sqlite" ,sqlite))) ("sqlite" ,sqlite)))
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
(patch-shebang "version.sh") (patch-shebang "version.sh")
(invoke "autoreconf" "-vfi")))) (invoke "autoreconf" "-vfi"))))

17
gnu/packages/web.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de> ;;; Copyright © 2013 Aljosha Papsch <misc@rpapsch.de>
;;; Copyright © 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com> ;;; Copyright © 2018 Raoul Jean Pierre Bonnal <ilpuccio.febo@gmail.com>
@ -410,12 +410,7 @@ APIs.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests included `(#:tests? #f ; no tests included
#:make-flags (list "CC=gcc") #:make-flags (list "CC=gcc")))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vif")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
@ -849,7 +844,7 @@ UTS#46.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; configure.in and Makefile.am aren't in the root of the ;; configure.in and Makefile.am aren't in the root of the
;; source tree. ;; source tree.
@ -4028,11 +4023,7 @@ and vice-versa.")
"1bgg2kbj311pqdzw2v33za7k66g1rv44kkvvnz2gnpaasi9k0ii8")))) "1bgg2kbj311pqdzw2v33za7k66g1rv44kkvvnz2gnpaasi9k0ii8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; tests require bundling googletest sources `(#:tests? #f)) ;tests require bundling googletest sources
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "sh" "autogen.sh")))))))
;; The release tarball lacks the generated files. ;; The release tarball lacks the generated files.
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)

4
gnu/packages/wget.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
@ -140,7 +140,7 @@ online pastebin services.")
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
;; Make sure all the files are writable so that ./bootstrap ;; Make sure all the files are writable so that ./bootstrap
;; can proceed. ;; can proceed.

9
gnu/packages/wm.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Al McElrath <hello@yrns.org> ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@crash.cx> ;;; Copyright © 2016, 2017, 2018 ng0 <ng0@crash.cx>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
@ -355,12 +355,7 @@ prompt.")
"119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053")))) "119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ;No tests included. `(#:tests? #f)) ;no tests included
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(inputs (inputs
`(("xcb-util-image" ,xcb-util-image) `(("xcb-util-image" ,xcb-util-image)
("xcb-util" ,xcb-util) ("xcb-util" ,xcb-util)

9
gnu/packages/xdisorg.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2013, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com> ;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
@ -136,12 +136,7 @@ program.")
"0n7pczk9vv30zf8qfln8ba3hnif9yfdxg0m84djac469wc28hnya")))) "0n7pczk9vv30zf8qfln8ba3hnif9yfdxg0m84djac469wc28hnya"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; There is no test suite '(#:tests? #f)) ;there is no test suite
#:phases
(modify-phases %standard-phases
;; Since version 0.13, bootstrapped releases are no longer available.
(add-after 'unpack 'bootstrap
(lambda _ (zero? (system* "autoreconf" "-v")))))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))

2
gnu/packages/xml.scm
View File

@ -1231,7 +1231,7 @@ files. It is designed to be fast and to handle large input files.")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Bootstrapping is required in order to fix the test driver script. ;; Bootstrapping is required in order to fix the test driver script.
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
(zero? (system* "bash" "bootstrap"))))))) (zero? (system* "bash" "bootstrap")))))))
(native-inputs (native-inputs

14
gnu/packages/xorg.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com> ;;; Copyright © 2015 Cyrill Schenkel <cyrill.schenkel@gmail.com>
@ -2765,11 +2765,7 @@ framebuffer device.")
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-xorg-conf-dir=" (list (string-append "--with-xorg-conf-dir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/X11/xorg.conf.d")) "/share/X11/xorg.conf.d"))))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Adreno video driver for X server") (synopsis "Adreno video driver for X server")
(description (description
@ -2924,11 +2920,7 @@ X server.")
(string-prefix? "x86_64-" system))) (string-prefix? "x86_64-" system)))
%supported-systems)) %supported-systems))
(arguments (arguments
'(#:configure-flags '("--with-default-accel=uxa") '(#:configure-flags '("--with-default-accel=uxa")))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(home-page "https://www.x.org/wiki/") (home-page "https://www.x.org/wiki/")
(synopsis "Intel video driver for X server") (synopsis "Intel video driver for X server")
(description (description

4
gnu/packages/zile.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
@ -114,7 +114,7 @@ default Emacs configuration, but it carries a much lighter feature set.")
(substitute-keyword-arguments (package-arguments zile) (substitute-keyword-arguments (package-arguments zile)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(add-after 'unpack 'bootstrap (replace 'bootstrap
(lambda _ (lambda _
;; Make sure all the files are writable so that ./bootstrap ;; Make sure all the files are writable so that ./bootstrap
;; can proceed. ;; can proceed.

1
guix/build/ant-build-system.scm
View File

@ -228,6 +228,7 @@ repack them. This is necessary to ensure that archives are reproducible."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(replace 'unpack unpack) (replace 'unpack unpack)
(delete 'bootstrap)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)

2
guix/build/asdf-build-system.scm
View File

@ -220,6 +220,7 @@ valid."
(define %standard-phases/source (define %standard-phases/source
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(delete 'check) (delete 'check)
(delete 'build) (delete 'build)
@ -227,6 +228,7 @@ valid."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(delete 'install) (delete 'install)
(replace 'build build) (replace 'build build)

1
guix/build/cargo-build-system.scm
View File

@ -172,6 +172,7 @@ SRC-NAME as if it was part of the directory DIR-NAME with name
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)

3
guix/build/cmake-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014, 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
@ -86,6 +86,7 @@
;; Everything is as with the GNU Build System except for the `configure' ;; Everything is as with the GNU Build System except for the `configure'
;; and 'check' phases. ;; and 'check' phases.
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'check check) (replace 'check check)
(replace 'configure configure))) (replace 'configure configure)))

1
guix/build/dub-build-system.scm
View File

@ -121,6 +121,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)

1
guix/build/emacs-build-system.scm
View File

@ -262,6 +262,7 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages."
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(add-after 'set-paths 'set-emacs-load-path set-emacs-load-path) (add-after 'set-paths 'set-emacs-load-path set-emacs-load-path)
(replace 'unpack unpack) (replace 'unpack unpack)
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
;; Move the build phase after install: the .el files are byte compiled ;; Move the build phase after install: the .el files are byte compiled
;; directly in the store. ;; directly in the store.

1
guix/build/font-build-system.scm
View File

@ -59,6 +59,7 @@ archive, or a font file."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(replace 'unpack unpack) (replace 'unpack unpack)
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(delete 'check) (delete 'check)
(delete 'build) (delete 'build)

40
guix/build/gnu-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -159,6 +159,43 @@ working directory."
(zero? (system* "tar" "xvf" source))) (zero? (system* "tar" "xvf" source)))
(chdir (first-subdirectory "."))))) (chdir (first-subdirectory ".")))))
(define %bootstrap-scripts
;; Typical names of Autotools "bootstrap" scripts.
'("bootstrap" "bootstrap.sh" "autogen.sh"))
(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts)
#:allow-other-keys)
"If the code uses Autotools and \"configure\" is missing, run
\"autoreconf\". Otherwise do nothing."
;; Note: Run that right after 'unpack' so that the generated files are
;; visible when the 'patch-source-shebangs' phase runs.
(if (not (file-exists? "configure"))
;; First try one of the BOOTSTRAP-SCRIPTS. If none exists, and it's
;; clearly an Autoconf-based project, run 'autoreconf'. Otherwise, do
;; nothing (perhaps the user removed or overrode the 'configure' phase.)
(let ((script (find file-exists? bootstrap-scripts)))
;; GNU packages often invoke the 'git-version-gen' script from
;; 'configure.ac' so make sure it has a valid shebang.
(false-if-file-not-found
(patch-shebang "build-aux/git-version-gen"))
(if script
(let ((script (string-append "./" script)))
(format #t "running '~a'~%" script)
(if (executable-file? script)
(begin
(patch-shebang script)
(invoke script))
(invoke "sh" script)))
(if (or (file-exists? "configure.ac")
(file-exists? "configure.in"))
(invoke "autoreconf" "-vif")
(format #t "no 'configure.ac' or anything like that, \
doing nothing~%"))))
(format #t "GNU build system bootstrapping not needed~%"))
#t)
;; See <http://bugs.gnu.org/17840>. ;; See <http://bugs.gnu.org/17840>.
(define* (patch-usr-bin-file #:key native-inputs inputs (define* (patch-usr-bin-file #:key native-inputs inputs
(patch-/usr/bin/file? #t) (patch-/usr/bin/file? #t)
@ -672,6 +709,7 @@ which cannot be found~%"
(let-syntax ((phases (syntax-rules () (let-syntax ((phases (syntax-rules ()
((_ p ...) `((p . ,p) ...))))) ((_ p ...) `((p . ,p) ...)))))
(phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack (phases set-SOURCE-DATE-EPOCH set-paths install-locale unpack
bootstrap
patch-usr-bin-file patch-usr-bin-file
patch-source-shebangs configure patch-generated-file-shebangs patch-source-shebangs configure patch-generated-file-shebangs
build check install build check install

1
guix/build/go-build-system.scm
View File

@ -261,6 +261,7 @@ files in OUTPUTS."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(delete 'patch-generated-file-shebangs) (delete 'patch-generated-file-shebangs)
(replace 'unpack unpack) (replace 'unpack unpack)

1
guix/build/haskell-build-system.scm
View File

@ -266,6 +266,7 @@ given Haskell package."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(add-before 'configure 'setup-compiler setup-compiler) (add-before 'configure 'setup-compiler setup-compiler)
(add-before 'install 'haddock haddock) (add-before 'install 'haddock haddock)
(add-after 'install 'register register) (add-after 'install 'register register)

1
guix/build/minify-build-system.scm
View File

@ -60,6 +60,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(replace 'build build) (replace 'build build)
(delete 'check) (delete 'check)

1
guix/build/ocaml-build-system.scm
View File

@ -103,6 +103,7 @@
;; Everything is as with the GNU Build System except for the `configure' ;; Everything is as with the GNU Build System except for the `configure'
;; , `build', `check' and `install' phases. ;; , `build', `check' and `install' phases.
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(add-before 'configure 'ocaml-findlib-environment (add-before 'configure 'ocaml-findlib-environment
ocaml-findlib-environment) ocaml-findlib-environment)
(add-before 'install 'prepare-install prepare-install) (add-before 'install 'prepare-install prepare-install)

3
guix/build/perl-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -76,6 +76,7 @@
;; Everything is as with the GNU Build System except for the `configure', ;; Everything is as with the GNU Build System except for the `configure',
;; `build', `check', and `install' phases. ;; `build', `check', and `install' phases.
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'install install) (replace 'install install)
(replace 'check check) (replace 'check check)
(replace 'build build) (replace 'build build)

3
guix/build/python-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@ -247,6 +247,7 @@ installed with setuptools."
;; 'configure' phase is not needed. ;; 'configure' phase is not needed.
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(replace 'install install) (replace 'install install)
(replace 'check check) (replace 'check check)

1
guix/build/r-build-system.scm
View File

@ -99,6 +99,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(delete 'build) (delete 'build)
(delete 'check) ; tests must be run after installation (delete 'check) ; tests must be run after installation

1
guix/build/ruby-build-system.scm
View File

@ -308,6 +308,7 @@ extended with definitions for VARS."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(replace 'unpack unpack) (replace 'unpack unpack)
(add-before 'build 'extract-gemspec extract-gemspec) (add-before 'build 'extract-gemspec extract-gemspec)

1
guix/build/scons-build-system.scm
View File

@ -52,6 +52,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(delete 'configure) (delete 'configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)

1
guix/build/texlive-build-system.scm
View File

@ -81,6 +81,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(delete 'check) (delete 'check)

1
guix/build/waf-build-system.scm
View File

@ -70,6 +70,7 @@
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(delete 'bootstrap)
(replace 'configure configure) (replace 'configure configure)
(replace 'build build) (replace 'build build)
(replace 'check check) (replace 'check check)