me
/
guix
Archived
1
0
Fork 0
Code

gnu: Use autoconf instead of autoconf-wrapper when possible. 

This should reduce confusion on when to use the "autoconf"
package and when to use "autoconf-wrapper" instead in
package definitions.

Fixes <https://bugs.gnu.org/46564>.

* gnu/packages/autotools.scm (autoconf-wrapper):
  advise to use the "autoconf" package instead where
  possible.
* gnu/packages/game-development.scm (tsukundere)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gimp.scm
  (glimpse)[native-inputs]: likewise.
  (gimp-resynthesizer)[native-inputs]: add comment on why
  "autoconf-wrapper" is used.
* gnu/packages/gnunet.scm (gnunet)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/gnupg.scm (signing-party)[native-inputs]:
  add comment on why "autoconf-wrapper" is used.
* gnu/packages/guile-xyz.scm
  (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]:
  use "autoconf" instead of "autoconf-wrapper".
* gnu/packages/libevent.scm (libuv)[native-inputs]: indicates
  "autoconf-wrapper" needs to be replaced with "autoconf"
  on core-updates.
* gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf"
  instead of "autoconf-wrapper".
* gnu/packages/mail.scm (libetpan)[native-inputs]: likewise.
* gnu/packages/mate.scm
  (mate-icon-theme-faenza)[native-inputs]: add comment on why
  "autoconf-wrapper" is used.
  (mate-screensaver)[native-inputs]: use "autoconf" instead of
  "autoconf-wrapper".
* gnu/packages/package-management.scm (guix)[native-inputs]: likewise.
* gnu/packages/sawfish.scm (librep)[native-inputs]: likewise.
* gnu/packages/video.scm (motion)[native-inputs]: likewise.
* gnu/packages/zile.scm (zile)[native-inputs]: likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Maxime Devos 2021-02-22 16:43:10 +01:00 committed by Ludovic Courtès
parent f526105210
commit ce10e2b3e9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
14 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/autotools.scm
View File

@ -267,6 +267,8 @@ exec ~a --no-auto-compile \"$0\" \"$@\"
;; Do not show it in the UI since it's meant for internal use.
(properties '((hidden? . #t)))))
;; Only use this package when autoconf is not usable,
;; see <https://issues.guix.gnu.org/46564#1>.
(define-public autoconf-wrapper
(make-autoconf-wrapper autoconf))

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

@ -529,7 +529,7 @@ clone.")
all)))
#t))))))
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)

4
gnu/packages/gimp.scm
View File

@ -518,6 +518,8 @@ MyPaint.")
(mkdir-p target)
#t))))))
(native-inputs
;; avoid ./autogen.sh: ./configure: /bin/sh: bad interpreter:
;; No such file or directory
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("glib" ,glib "bin") ; glib-gettextize
@ -590,7 +592,7 @@ transferring the style of an image.")
(format port "for dir in '~a'.split(':'):~%" pythonpath)
(format port " site.addsitedir(dir)~%")))))))))
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)

2
gnu/packages/gnunet.scm
View File

@ -368,7 +368,7 @@ kinds of basic applications for the foundation of a GNU internet.")
"0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv"))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)))
(inputs `(("guile" ,guile-2.0)
("gnunet" ,gnunet)))

2
gnu/packages/gnupg.scm
View File

@ -695,6 +695,8 @@ PGP keysigning parties.")
"1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5"))))
(build-system gnu-build-system)
(native-inputs
;; autoconf-wrapper is required due to the non-standard
;; 'configure phase.
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)))
(inputs `(("perl" ,perl)

8
gnu/packages/guile-xyz.scm
View File

@ -393,7 +393,7 @@ dictionary and suggesting spelling corrections.")
(string-append "--libdir=" (assoc-ref %outputs "out")
"/lib/bash"))))
(native-inputs `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@ -660,7 +660,7 @@ is not available for Guile 2.0.")
"1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
("texinfo" ,texinfo)))
@ -1723,7 +1723,7 @@ provides tight coupling to Guix.")
#t))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("texinfo" ,texinfo)
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
@ -1856,7 +1856,7 @@ users and in some situations.")
"1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)

1
gnu/packages/libevent.scm
View File

@ -115,6 +115,7 @@ limited support for fork events.")
'(#:configure-flags '("--disable-static")
;; XXX: Some tests want /dev/tty, attempt to make connections, etc.
#:tests? #f))
;; TODO replace with autoconf on core-updates
(native-inputs `(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("libtool" ,libtool)

2
gnu/packages/logging.scm
View File

@ -99,7 +99,7 @@ staying as close to their API as is reasonable.")
#t)))))
(native-inputs
`(("perl" ,perl) ;for tests
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(synopsis "C++ logging library")

2
gnu/packages/mail.scm
View File

@ -1476,7 +1476,7 @@ useful features.")
(sha256
(base32 "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn"))))
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf-wrapper)
(native-inputs `(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))

4
gnu/packages/mate.scm
View File

@ -176,6 +176,8 @@ actions.")
(setenv "CONFIG_SHELL" (which "sh"))
(invoke "sh" "autogen.sh"))))))
(native-inputs
;; autoconf-wrapper is required due to the non-standard
;; 'autoconf phase.
`(("autoconf" ,autoconf-wrapper)
("automake" ,automake)
("intltool" ,intltool)
@ -1201,7 +1203,7 @@ Re-decorates windows on un-maximise.
(("dbus-1") ""))))))))
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("gettext" ,gettext-minimal)
("intltool" ,intltool)
("mate-common" ,mate-common)

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

@ -379,7 +379,7 @@ $(prefix)/etc/init.d\n")))
;; XXX: Keep the development inputs here even though
;; they're unnecessary, just so that 'guix environment
;; guix' always contains them.
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("texinfo" ,texinfo)

2
gnu/packages/sawfish.scm
View File

@ -53,7 +53,7 @@
`(("makeinfo" ,texinfo)
("pkg-config" ,pkg-config)
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs

2
gnu/packages/video.scm
View File

@ -4265,7 +4265,7 @@ It counts more than 100 plugins.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf-wrapper)
`(("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))

2
gnu/packages/zile.scm
View File

@ -120,7 +120,7 @@ default Emacs configuration, but it carries a much lighter feature set.")
,@(package-inputs zile)))
(native-inputs
`(("m4" ,m4) ;for 'bootstrap'
("autoconf" ,autoconf-wrapper)
("autoconf" ,autoconf)
("automake" ,automake)
;; For some reason, 'bootstrap' insists on having these.