Skip to content

Instantly share code, notes, and snippets.

@codemac

codemac/0001-guix-build-gnu-dist-export-autoreconf.patch

Created July 7, 2015 00:32
Show Gist options
  • Save codemac/a17528829e92cf667c20 to your computer and use it in GitHub Desktop.
Save codemac/a17528829e92cf667c20 to your computer and use it in GitHub Desktop.
Download ZIP
patch example
Raw
0001-guix-build-gnu-dist-export-autoreconf.patch
From 5723c42063d23ed9bd51e4b3bcf2d1de6f435c1a Mon Sep 17 00:00:00 2001
From: Jeff Mickey <j@codemac.net>
Date: Mon, 6 Jul 2015 17:06:47 -0700
Subject: [PATCH] guix/build/gnu-dist: export autoreconf
---
gnu/packages/audio.scm | 8 ++------
gnu/packages/check.scm | 4 +---
gnu/packages/ci.scm | 3 +--
gnu/packages/fontutils.scm | 4 +---
gnu/packages/freedesktop.scm | 6 +++---
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gl.scm | 4 +---
gnu/packages/linux.scm | 2 +-
gnu/packages/mail.scm | 4 +---
gnu/packages/rdf.scm | 4 +---
gnu/packages/ssh.scm | 2 +-
gnu/packages/textutils.scm | 3 +--
gnu/packages/tor.scm | 6 +-----
gnu/packages/unrtf.scm | 2 +-
gnu/packages/video.scm | 4 +---
gnu/packages/web.scm | 2 +-
gnu/packages/xorg.scm | 4 +---
guix/build-system/gnu.scm | 1 +
guix/build/gnu-dist.scm | 3 ++-
19 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ff6fb46..1aa8397 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1168,8 +1168,7 @@ tempo and pitch of an audio recording independently of one another.")
`(#:tests? #f ;no "check" target
#:phases (modify-phases %standard-phases
(add-before
- 'configure 'autoconf
- (lambda _ (zero? (system* "autoreconf" "-vfi"))))
+ 'configure 'autoconf autoreconf)
(add-before
'build 'fix-makefile
(lambda _
@@ -1593,10 +1592,7 @@ portions of LAME.")
;; Autoreconf is necessary because the audacity-compat patch modifies
;; .in files.
(alist-cons-after
- 'unpack 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vif")))
- %standard-phases)
+ 'unpack 'autoreconf autoreconf %standard-phases)
#:tests? #f)) ;no 'check' target
(home-page "http://www.portaudio.com/")
(synopsis "Audio I/O library")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e0ee7c4..26b0c52 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -68,9 +68,7 @@ source code editors and IDEs.")
(build-system gnu-build-system)
(arguments '(#:phases
(alist-cons-before
- 'configure 'autoconf
- (lambda _
- (zero? (system* "autoreconf" "-vfi")))
+ 'configure 'autoconf autoreconf
%standard-phases)))
(native-inputs
`(("automake" ,automake)
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index 5ab03c7..f023a74 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -143,8 +143,7 @@
"/doc/hydra-" ,version)))
#:phases (modify-phases %standard-phases
(add-after
- 'unpack 'bootstrap
- (lambda _ (zero? (system* "autoreconf" "-vfi"))))
+ 'unpack 'bootstrap autoreconf)
(add-before
'check 'check-setup
(lambda _ (setenv "LOGNAME" "test.log")))
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index c04f24b..9c11b51 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -279,9 +279,7 @@ smooth contours with constant curvature at the spline joins.")
("libtool" ,libtool)))
(arguments
`(#:phases (alist-cons-after
- 'unpack 'bootstrap
- (lambda _
- (zero? (system* "autoreconf" "-vi")))
+ 'unpack 'bootstrap autoreconf
%standard-phases)))
(synopsis "Unicode names and annotation list")
(description
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index eeb97cd..d569658 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -122,10 +122,10 @@ other applications that need to directly deal with input devices.")
(string-append "--with-rootprefix=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'autogen
+ (add-after 'unpack 'intltoolize
(lambda _
- (and (zero? (system* "intltoolize" "--force" "--automake"))
- (zero? (system* "autoreconf" "-vif"))))))))
+ (zero? (system* "intltoolize" "--force" "--automake"))))
+ (add-after 'intltoolize 'autoreconf autoreconf))))
(native-inputs
`(("intltool" ,intltool)
("gettext" ,gnu-gettext)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 09306e9..7cb4783 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -203,7 +203,7 @@ output file formats and printers.")
'unpack 'autogen
(lambda _
;; need to regenerate macros
- (system* "autoreconf" "-if")
+ (autoreconf)
;; do not run configure
(substitute* "autogen.sh"
(("^.*\\$srcdir/configure.*") ""))
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9bb1134..c557809 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -449,9 +449,7 @@ OpenGL graphics API.")
(arguments
`(#:phases
(alist-cons-after
- 'unpack 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vif")))
+ 'unpack 'autoreconf autoreconf
(alist-cons-before
'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 289b80e..9ba88d3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1060,7 +1060,7 @@ Linux-based operating systems.")
(("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
"$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
- (zero? (system* "autoreconf" "-vf")))
+ (autoreconf))
%standard-phases)
#:tests? #f)) ; no 'check' target
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f8eba5c..df0dec1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -342,9 +342,7 @@ repository and Maildir/IMAP as LOCAL repository.")
("tzdata" ,tzdata))) ;for mu/test/test-mu-query.c
(arguments
'(#:phases (alist-cons-after
- 'unpack 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vi")))
+ 'unpack 'autoreconf autoreconf
(alist-cons-before
'check 'check-tz-setup
(lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index ce6b215..45bdb1e 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -127,9 +127,7 @@ Java Lucene text search engine API to C++.")
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
- 'remove-out-of-tree-references 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vfi")))
+ 'remove-out-of-tree-references 'autoreconf autoreconf
(alist-cons-after
'unpack 'remove-out-of-tree-references
(lambda _
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 0a1a841..b1fbd67 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -201,7 +201,7 @@ Additionally, various channel-specific options can be negotiated.")
'unpack 'autoreconf
(lambda* (#:key inputs #:allow-other-keys)
(chmod "doc/version.texi" #o777) ;make it writable
- (zero? (system* "autoreconf" "-vfi")))
+ (autoreconf))
(alist-cons-after
'install 'fix-libguile-ssh-file-name
(lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 325386d..e1e1932 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -146,8 +146,7 @@ encoding, supporting Unicode version 7.0.")
(arguments
'(#:phases
(alist-cons-after
- 'unpack 'autoreconf
- (lambda _ (zero? (system* "autoreconf" "-vif")))
+ 'unpack 'autoreconf autoreconf
%standard-phases)))
(native-inputs
`(("autoconf" ,autoconf)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index f5fcfb8..30d4699 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -103,11 +103,7 @@ rejects UDP traffic from the application you're using.")
(assoc-ref %outputs "out")
"/etc/privoxy"))
#:phases (alist-cons-after
- 'unpack 'autoconf
- (lambda _
- ;; Unfortunately, this is not a tarball produced by
- ;; "make dist".
- (zero? (system* "autoreconf" "-vfi")))
+ 'unpack 'autoconf autoreconf
%standard-phases)
#:tests? #f))
(inputs
diff --git a/gnu/packages/unrtf.scm b/gnu/packages/unrtf.scm
index 6c578ce..d282dcc 100644
--- a/gnu/packages/unrtf.scm
+++ b/gnu/packages/unrtf.scm
@@ -59,7 +59,7 @@
#$grep "/bin:" #$sed "/bin:"
#$coreutils "/bin:"
(getenv "PATH")))
- (zero? (system* "autoreconf" "-vfi"))))))
+ (autoreconf)))))
(build-system gnu-build-system)
(home-page "http://www.gnu.org/software/unrtf")
(synopsis "Convert Rich Text Format documents to other formats")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6a5a250..c45414b 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -979,9 +979,7 @@ encapsulated.")
(arguments
'(#:phases
(alist-cons-after
- 'unpack 'autoreconf
- (lambda _
- (zero? (system* "autoreconf" "-vif")))
+ 'unpack 'autoreconf autoreconf
%standard-phases)))))
(define-public libdvdcss
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 99a176f..b05cd25 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -390,7 +390,7 @@ UTS#46")
;; source tree.
(copy-recursively "build/gnuauto" ".")
(setenv "AUTOMAKE" "automake --foreign")
- (zero? (system* "autoreconf" "-vfi")))
+ (autoreconf)
%standard-phases)))
(native-inputs
`(("automake" ,automake)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index dc04bee..52e12c9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2824,9 +2824,7 @@ supported, and the RENDER extension is not accelerated by this driver.")
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
- 'unpack 'bootstrap
- (lambda _
- (zero? (system* "autoreconf" "-vi")))
+ 'unpack 'bootstrap autoreconf
%standard-phases)))
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 8702c6c..7f26715 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -25,6 +25,7 @@
#:use-module (guix packages)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
+ #:re-export (autoreconf)
#:export (%gnu-build-system-modules
gnu-build
gnu-build-system
diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm
index ad69c6c..eabf50d 100644
--- a/guix/build/gnu-dist.scm
+++ b/guix/build/gnu-dist.scm
@@ -20,7 +20,8 @@
#:use-module (guix build utils)
#:use-module (guix build gnu-build-system)
#:use-module (srfi srfi-1)
- #:export (%dist-phases))
+ #:export (%dist-phases
+ autoreconf))
;;; Commentary:
;;;
--
2.4.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment