From d42be9473bac6b8bcfe17a37c92f2481cb2198fb Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Mon, 22 Feb 2021 16:43:10 +0100
Subject: [PATCH] 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://issues.guix.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.
---
gnu/packages/autotools.scm | 2 ++
gnu/packages/game-development.scm | 2 +-
gnu/packages/gimp.scm | 4 +++-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnupg.scm | 2 ++
gnu/packages/guile-xyz.scm | 8 ++++----
gnu/packages/libevent.scm | 1 +
gnu/packages/logging.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/mate.scm | 4 +++-
gnu/packages/package-management.scm | 2 +-
gnu/packages/sawfish.scm | 2 +-
gnu/packages/video.scm | 2 +-
gnu/packages/zile.scm | 2 +-
14 files changed, 23 insertions(+), 14 deletions(-)
@@ -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))
@@ -529,7 +529,7 @@ clone.")
all)))
#t))))))
(native-inputs
- `(("autoconf" ,autoconf-wrapper)
+ `(("autoconf" ,autoconf)
("automake" ,automake)
("guile" ,guile-3.0)
("pkg-config" ,pkg-config)
@@ -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)
@@ -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)))
@@ -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)
@@ -367,7 +367,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'.
@@ -642,7 +642,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)))
@@ -1697,7 +1697,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'.
@@ -1830,7 +1830,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)
@@ -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)
@@ -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")
@@ -1474,7 +1474,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)))
@@ -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)
@@ -377,7 +377,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)
@@ -53,7 +53,7 @@
`(("makeinfo" ,texinfo)
("pkg-config" ,pkg-config)
- ("autoconf" ,autoconf-wrapper)
+ ("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs
@@ -4244,7 +4244,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)))
@@ -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.
--
2.30.0