diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-02-27 11:53:06 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-02-28 09:49:01 -0500 |
| commit | 722ec722441a755e18fbc696d23441427dfb26af (patch) | |
| tree | 8d429f0ec1b30d692ab24bc07838e47b4cb33ab8 /gnu/packages/mail.scm | |
| parent | dd0a8ef15f903422c6b020e7d793986427add927 (diff) | |
| download | guix-722ec722441a755e18fbc696d23441427dfb26af.tar.gz | |
gnu: Move autoconf-style phases after the unpack phase.
* gnu/packages/audio.scm (soundtouch)[arguments]: Move 'bootstrap' after 'unpack'. Remove custom /usr/bin/file patching, which will now be handled by the 'patch-usr-bin-file' phase. * gnu/packages/emacs.scm (emacs-w3m)[arguments]: Rename 'pre-configure' phase to 'autoconf' and move it after 'unpack'. * gnu/packages/fontutils.scm (libuninameslist)[arguments]: Move 'bootstrap' phase after 'unpack'. * gnu/packages/libevent.scm (libuv)[arguments]: Move 'autogen' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". * gnu/packages/linux.scm (bridge-utils)[arguments]: Move 'bootstrap' phase after 'unpack'. * gnu/packages/mail.scm (libetpan)[arguments]: Move 'autogen' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". Setenv "NOCONFIGURE" before running autogen.sh. * gnu/packages/package-management.scm (guix-devel)[arguments]: Move 'bootstrap' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". * gnu/packages/rdf.scm (lrdf)[arguments]: Move 'autoreconf' phase after 'remove-out-of-tree-references' phase. * gnu/packages/tor.scm (privoxy)[arguments]: Move 'autoconf' phase after 'unpack'. * gnu/packages/web.scm (libpsl)[arguments]: Move 'bootstrap' phase after 'unpack'. Run "sh autogen.sh" instead of "./autogen.sh". Remove 'fix-autogen-shebang' phase.
Diffstat (limited to 'gnu/packages/mail.scm')
| -rw-r--r-- | gnu/packages/mail.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index dc33c8cbd3..17988cc4f9 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> @@ -432,14 +432,11 @@ useful features.") `(("curl" ,curl) ("expat" ,expat))) (arguments - '(#:phases (alist-cons-before - 'configure 'autogen + '(#:phases (alist-cons-after + 'unpack 'autogen (lambda _ - (system* "./autogen.sh")) ;; Note: this fails because the - ;; generated configure script uses /bin/sh. It is - ;; replaced in the configure phase by the correct - ;; value. TODO: replace the configure phase by the - ;; autogen phase and have the SHELL variable be replaced + (setenv "NOCONFIGURE" "true") + (zero? (system* "sh" "autogen.sh"))) %standard-phases) #:configure-flags '("--disable-static" "--disable-db"))) |