ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Move autoconf-style phases after the unpack phase.

Browse source 
* 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.
This commit is contained in:
Mark H Weaver 2015-02-27 11:53:06 -05:00
parent dd0a8ef15f
commit 722ec72244
10 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/audio.scm
View file

@ -804,13 +804,10 @@ (define-public soundtouch
("file" ,file))) ("file" ,file)))
(arguments (arguments
'(#:phases '(#:phases
(alist-cons-before (alist-cons-after
'configure 'bootstrap 'unpack 'bootstrap
(lambda _ (lambda _
(unless (zero? (system* "sh" "bootstrap")) (zero? (system* "sh" "bootstrap")))
(error "bootstrap failed"))
(substitute* '("configure")
(("/usr/bin/file") "file")))
%standard-phases))) %standard-phases)))
(home-page "http://www.surina.net/soundtouch/") (home-page "http://www.surina.net/soundtouch/")
(synopsis (synopsis

4
gnu/packages/emacs.scm
View file

@ -309,8 +309,8 @@ (define-public emacs-w3m
out "/share/images/emacs-w3m"))) out "/share/images/emacs-w3m")))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(alist-cons-before (alist-cons-after
'configure 'pre-configure 'unpack 'autoconf
(lambda _ (lambda _
(zero? (system* "autoconf"))) (zero? (system* "autoconf")))
(alist-cons-before (alist-cons-before

4
gnu/packages/fontutils.scm
View file

@ -278,8 +278,8 @@ (define-public libuninameslist
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool))) ("libtool" ,libtool)))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases (alist-cons-after
'configure 'bootstrap 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vi"))) (zero? (system* "autoreconf" "-vi")))
%standard-phases))) %standard-phases)))

6
gnu/packages/libevent.scm
View file

@ -73,12 +73,12 @@ (define-public libuv
"1ys2wlypdbv59yywn91d5vl329z50mi7ivi3fj5rjm4mr9g3wnmr")))) "1ys2wlypdbv59yywn91d5vl329z50mi7ivi3fj5rjm4mr9g3wnmr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-after
'configure 'autogen 'unpack 'autogen
(lambda _ (lambda _
;; Fashionable people don't run 'make dist' these days, so ;; Fashionable people don't run 'make dist' these days, so
;; we need to do that ourselves. ;; we need to do that ourselves.
(zero? (system* "./autogen.sh"))) (zero? (system* "sh" "autogen.sh")))
%standard-phases) %standard-phases)
;; XXX: Some tests want /dev/tty, attempt to make connections, etc. ;; XXX: Some tests want /dev/tty, attempt to make connections, etc.

4
gnu/packages/linux.scm
View file

@ -1005,8 +1005,8 @@ (define-public bridge-utils
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake))) ("automake" ,automake)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-after
'configure 'bootstrap 'unpack 'bootstrap
(lambda _ (lambda _
(zero? (system* "autoreconf" "-vf"))) (zero? (system* "autoreconf" "-vf")))
%standard-phases) %standard-phases)

13
gnu/packages/mail.scm
View file

@ -1,6 +1,6 @@
;;; 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 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 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
@ -432,14 +432,11 @@ (define-public libetpan
`(("curl" ,curl) `(("curl" ,curl)
("expat" ,expat))) ("expat" ,expat)))
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-after
'configure 'autogen 'unpack 'autogen
(lambda _ (lambda _
(system* "./autogen.sh")) ;; Note: this fails because the (setenv "NOCONFIGURE" "true")
;; generated configure script uses /bin/sh. It is (zero? (system* "sh" "autogen.sh")))
;; 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
%standard-phases) %standard-phases)
#:configure-flags #:configure-flags
'("--disable-static" "--disable-db"))) '("--disable-static" "--disable-db")))

6
gnu/packages/package-management.scm
View file

@ -156,15 +156,15 @@ (define guix-devel
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.8.1) (substitute-keyword-arguments (package-arguments guix-0.8.1)
((#:phases phases) ((#:phases phases)
`(alist-cons-before `(alist-cons-after
'configure 'bootstrap 'unpack '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)
(chmod po #o666)) (chmod po #o666))
(find-files "." "\\.po$")) (find-files "." "\\.po$"))
(zero? (system* "./bootstrap"))) (zero? (system* "sh" "bootstrap")))
,phases)))) ,phases))))
(native-inputs (native-inputs
`(("autoconf" ,(autoconf-wrapper)) `(("autoconf" ,(autoconf-wrapper))

6
gnu/packages/rdf.scm
View file

@ -140,9 +140,9 @@ (define-public lrdf
(substitute* "examples/Makefile.am" (substitute* "examples/Makefile.am"
(("instances_test remove_test") "instances_test") (("instances_test remove_test") "instances_test")
(("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) (("\\$\\(TESTS\\) remove_test") "$(TESTS)")))
(alist-cons-before (alist-cons-after
'configure 'autoreconf 'remove-out-of-tree-references 'autoreconf
(lambda* (#:key inputs #:allow-other-keys) (lambda _
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi")))
%standard-phases)))) %standard-phases))))
(inputs (inputs

6
gnu/packages/tor.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -99,8 +99,8 @@ (define-public privoxy
#:configure-flags (list (string-append "--sysconfdir=" #:configure-flags (list (string-append "--sysconfdir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/privoxy")) "/etc/privoxy"))
#:phases (alist-cons-before #:phases (alist-cons-after
'configure 'autoconf 'unpack 'autoconf
(lambda _ (lambda _
;; Unfortunately, this is not a tarball produced by ;; Unfortunately, this is not a tarball produced by
;; "make dist". ;; "make dist".

17
gnu/packages/web.scm
View file

@ -2,7 +2,7 @@
;;; 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 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 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 © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; ;;;
@ -258,18 +258,11 @@ (define-public libpsl
("which" ,which) ("which" ,which)
("libtool" ,libtool))) ("libtool" ,libtool)))
(arguments (arguments
`(#:phases (alist-cons-before `(#:phases (alist-cons-after
'bootstrap 'fix-autogen-shebang 'unpack 'bootstrap
(lambda _ (lambda _
(substitute* "autogen.sh" (zero? (system* "sh" "autogen.sh")))
;; Removing -e as it causes the whole script to fail when %standard-phases)))
;; `which gtkdocize` fails.
(("# !/bin/sh -e") (string-append "#!" (which "sh")))))
(alist-cons-before
'patch-usr-bin-file 'bootstrap
(lambda _
(zero? (system* "./autogen.sh")))
%standard-phases))))
(home-page "https://github.com/rockdaboot/libpsl") (home-page "https://github.com/rockdaboot/libpsl")
(synopsis "C library for the Publix Suffix List") (synopsis "C library for the Publix Suffix List")
(description (description