gnu: 'autoconf-wrapper' is no longer a procedure.
Fixes <https://bugs.gnu.org/30710>. Suggested by Björn Höfling <bjoern.hoefling@bjoernhoefling.de>. * gnu/packages/autotools.scm (autoconf-wrapper): Rename to... (make-autoconf-wrapper): ... this. Add 'properties' field. (autoconf-wrapper): New variable. * gnu/packages/gnunet.scm (guile-gnunet): Adjust accordingly. * gnu/packages/gnupg.scm (signing-party): Likewise. * gnu/packages/guile.scm (guile-ics, guile-bash): Likewise. * gnu/packages/libevent.scm (libuv): Likewise. * gnu/packages/logging.scm (glog): Likewise. * gnu/packages/mail.scm (libetpan): Likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza) (mate-screensaver): Likewise. * gnu/packages/package-management.scm (guix): Likewise. * gnu/packages/sawfish.scm (librep): Likewise. * gnu/packages/video.scm (motion): Likewise. * gnu/packages/zile.scm (zile-on-guile): Likewise.master
parent
ab9ad13802
commit
464f544739
|
@ -124,8 +124,8 @@ know anything about Autoconf or M4.")
|
||||||
(string-append "--build=" build)))))))))))
|
(string-append "--build=" build)))))))))))
|
||||||
|
|
||||||
|
|
||||||
(define* (autoconf-wrapper #:optional (autoconf autoconf))
|
(define (make-autoconf-wrapper autoconf)
|
||||||
"Return an wrapper around AUTOCONF that generates `configure' scripts that
|
"Return a wrapper around AUTOCONF that generates `configure' scripts that
|
||||||
use our own Bash instead of /bin/sh in shebangs. For that reason, it should
|
use our own Bash instead of /bin/sh in shebangs. For that reason, it should
|
||||||
only be used internally---users should not end up distributing `configure'
|
only be used internally---users should not end up distributing `configure'
|
||||||
files with a system-specific shebang."
|
files with a system-specific shebang."
|
||||||
|
@ -191,7 +191,13 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
|
||||||
(patch-shebang "configure"))
|
(patch-shebang "configure"))
|
||||||
(exit (status:exit-val result))))
|
(exit (status:exit-val result))))
|
||||||
port)))
|
port)))
|
||||||
(chmod (string-append bin "/autoconf") #o555)))))))
|
(chmod (string-append bin "/autoconf") #o555)))))
|
||||||
|
|
||||||
|
;; Do not show it in the UI since it's meant for internal use.
|
||||||
|
(properties '((hidden? . #t)))))
|
||||||
|
|
||||||
|
(define-public autoconf-wrapper
|
||||||
|
(make-autoconf-wrapper autoconf))
|
||||||
|
|
||||||
(define-public autoconf-archive
|
(define-public autoconf-archive
|
||||||
(package
|
(package
|
||||||
|
@ -253,7 +259,7 @@ output is indexed in many ways to simplify browsing.")
|
||||||
(search-patches "automake-skip-amhello-tests.patch"))))
|
(search-patches "automake-skip-amhello-tests.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,(autoconf-wrapper))
|
`(("autoconf" ,autoconf-wrapper)
|
||||||
("perl" ,perl)))
|
("perl" ,perl)))
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
|
@ -348,7 +354,7 @@ Makefile, simplifying the entire process for the developer.")
|
||||||
("perl" ,perl)
|
("perl" ,perl)
|
||||||
("help2man" ,help2man) ;because we modify ltmain.sh
|
("help2man" ,help2man) ;because we modify ltmain.sh
|
||||||
("automake" ,automake) ;some tests rely on 'aclocal'
|
("automake" ,automake) ;some tests rely on 'aclocal'
|
||||||
("autoconf" ,(autoconf-wrapper)))) ;others on 'autom4te'
|
("autoconf" ,autoconf-wrapper))) ;others on 'autom4te'
|
||||||
|
|
||||||
(arguments
|
(arguments
|
||||||
`(;; Libltdl is provided as a separate package, so don't install it here.
|
`(;; Libltdl is provided as a separate package, so don't install it here.
|
||||||
|
|
|
@ -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>
|
||||||
|
@ -327,7 +327,7 @@ kinds of basic applications for the foundation of a GNU internet.")
|
||||||
(lambda _
|
(lambda _
|
||||||
(invoke "autoreconf" "-vfi"))))))
|
(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)))
|
||||||
(inputs `(("guile" ,guile-2.0)
|
(inputs `(("guile" ,guile-2.0)
|
||||||
("gnunet" ,gnunet)))
|
("gnunet" ,gnunet)))
|
||||||
|
|
|
@ -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, 2015 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||||
|
@ -618,7 +618,7 @@ PGP keysigning parties.")
|
||||||
"1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"))))
|
"1n5bpcfpl9vg1xp6r1jhbyahrgdyxp05b5pria1rh4m0qnv8sifr"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,(autoconf-wrapper))
|
`(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)))
|
("automake" ,automake)))
|
||||||
(inputs `(("perl" ,perl)
|
(inputs `(("perl" ,perl)
|
||||||
("perl-text-template" ,perl-text-template)
|
("perl-text-template" ,perl-text-template)
|
||||||
|
|
|
@ -769,7 +769,7 @@ format is also supported.")
|
||||||
(symlink "README.org" "README")
|
(symlink "README.org" "README")
|
||||||
(zero? (system* "autoreconf" "-fi")))))))
|
(zero? (system* "autoreconf" "-fi")))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,(autoconf-wrapper))
|
`(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("texinfo" ,texinfo)
|
("texinfo" ,texinfo)
|
||||||
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
|
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
|
||||||
|
@ -1856,7 +1856,7 @@ dictionary and suggesting spelling corrections.")
|
||||||
(string-append "--libdir=" (assoc-ref %outputs "out")
|
(string-append "--libdir=" (assoc-ref %outputs "out")
|
||||||
"/lib/bash"))))
|
"/lib/bash"))))
|
||||||
(native-inputs `(("pkg-config" ,pkg-config)
|
(native-inputs `(("pkg-config" ,pkg-config)
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("libtool" ,libtool)
|
("libtool" ,libtool)
|
||||||
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
|
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2015, 2017 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
|
||||||
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
;;; Copyright © 2016 David Thompson <davet@gnu.org>
|
||||||
|
@ -140,7 +140,7 @@ limited support for fork events.")
|
||||||
|
|
||||||
;; XXX: Some tests want /dev/tty, attempt to make connections, etc.
|
;; XXX: Some tests want /dev/tty, attempt to make connections, etc.
|
||||||
#:tests? #f))
|
#:tests? #f))
|
||||||
(native-inputs `(("autoconf" ,(autoconf-wrapper))
|
(native-inputs `(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("libtool" ,libtool)
|
("libtool" ,libtool)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
|
||||||
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
|
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
|
||||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
|
@ -73,7 +73,7 @@ staying as close to their API as is reasonable.")
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("perl" ,perl) ;for tests
|
`(("perl" ,perl) ;for tests
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("libtool" ,libtool)))
|
("libtool" ,libtool)))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -931,7 +931,7 @@ useful features.")
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf"))))
|
(base32 "1sxnaglp5hb0z78sgnfzva4x8m4flqhicvm1dz0krkxdmfsafrsf"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs `(("autoconf" ,(autoconf-wrapper))
|
(native-inputs `(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("libtool" ,libtool)
|
("libtool" ,libtool)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
|
|
|
@ -135,7 +135,7 @@ MATE applications.")
|
||||||
(setenv "CONFIG_SHELL" (which "sh"))
|
(setenv "CONFIG_SHELL" (which "sh"))
|
||||||
(invoke "sh" "autogen.sh"))))))
|
(invoke "sh" "autogen.sh"))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,(autoconf-wrapper))
|
`(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("intltool" ,intltool)
|
("intltool" ,intltool)
|
||||||
("icon-naming-utils" ,icon-naming-utils)
|
("icon-naming-utils" ,icon-naming-utils)
|
||||||
|
@ -1191,7 +1191,7 @@ Re-decorates windows on un-maximise.
|
||||||
(("dbus-1") ""))))))))
|
(("dbus-1") ""))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("automake" ,automake)
|
`(("automake" ,automake)
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("gettext" ,gettext-minimal)
|
("gettext" ,gettext-minimal)
|
||||||
("intltool" ,intltool)
|
("intltool" ,intltool)
|
||||||
("kbproto" ,kbproto)
|
("kbproto" ,kbproto)
|
||||||
|
|
|
@ -239,7 +239,7 @@
|
||||||
;; XXX: Keep the development inputs here even though
|
;; XXX: Keep the development inputs here even though
|
||||||
;; they're unnecessary, just so that 'guix environment
|
;; they're unnecessary, just so that 'guix environment
|
||||||
;; guix' always contains them.
|
;; guix' always contains them.
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("gettext" ,gettext-minimal)
|
("gettext" ,gettext-minimal)
|
||||||
("texinfo" ,texinfo)
|
("texinfo" ,texinfo)
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
`(("makeinfo" ,texinfo)
|
`(("makeinfo" ,texinfo)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
|
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("libtool" ,libtool)))
|
("libtool" ,libtool)))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -2761,7 +2761,7 @@ It counts more than 100 plugins.")
|
||||||
(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)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,(autoconf-wrapper))
|
`(("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
|
|
|
@ -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>
|
||||||
;;;
|
;;;
|
||||||
|
@ -102,7 +102,7 @@ default Emacs configuration, but it carries a much lighter feature set.")
|
||||||
,@(package-inputs zile)))
|
,@(package-inputs zile)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("m4" ,m4) ;for 'bootstrap'
|
`(("m4" ,m4) ;for 'bootstrap'
|
||||||
("autoconf" ,(autoconf-wrapper))
|
("autoconf" ,autoconf-wrapper)
|
||||||
("automake" ,automake)
|
("automake" ,automake)
|
||||||
|
|
||||||
;; For some reason, 'bootstrap' insists on having these.
|
;; For some reason, 'bootstrap' insists on having these.
|
||||||
|
|
Loading…
Reference in New Issue