aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-11-08 22:37:33 -0500
committerMark H Weaver <mhw@netris.org>2015-11-13 12:42:47 -0500
commit4d53c29e6ca0fb432e92c298f9537c688fbbc10e (patch)
tree175ab6b3d4b7ad853e6b003cc680fea56c082009 /gnu
parent9715df7fbed076a1073a5d90d81a26f2b8e24df8 (diff)
downloadguix-4d53c29e6ca0fb432e92c298f9537c688fbbc10e.tar
guix-4d53c29e6ca0fb432e92c298f9537c688fbbc10e.tar.gz
gnu: mit-krb5: Refactor build code; support multiple patches.
* gnu/packages/mit-krb5.scm (mit-krb5)[source]: Use version-major+minor. [arguments]: Use modify-phases. Split and rewrite 'unpack' phase into 'unpack', 'apply-patches', and 'enter-source-directory' phases. Add a 'pre-check' phase instead of replacing the 'check' phase. Combine substitutions on the same file. In the 'unpack' phase, find native-inputs with names starting with "patch/" and apply them all. Print a message for each patch applied. Do not rely on the result of 'chdir', which is unspecified. Determine the names of the inner tar file and the directory in a more robust way. Add (ice-9 ftw), (ice-9 match) and (srfi srfi-1) to #:modules.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/mit-krb5.scm85
1 files changed, 52 insertions, 33 deletions
diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm
index 4327e1da65..76d8b2473e 100644
--- a/gnu/packages/mit-krb5.scm
+++ b/gnu/packages/mit-krb5.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu))
(define-public mit-krb5
@@ -33,7 +35,7 @@
(source (origin
(method url-fetch)
(uri (string-append "http://web.mit.edu/kerberos/www/dist/krb5/"
- (string-copy version 0 (string-rindex version #\.))
+ (version-major+minor version)
"/krb5-" version "-signed.tar"))
(sha256 (base32
"1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75"))))
@@ -42,40 +44,57 @@
`(("bison" ,bison)
("perl" ,perl)))
(arguments
- '(#:phases
- (alist-replace
- 'unpack
- (lambda* (#:key source #:allow-other-keys)
- (let ((inner
- (substring source
- (string-index-right source #\k)
- (string-index-right source #\-))))
- (and (zero? (system* "tar" "xvf" source))
- (zero? (system* "tar" "xvf" (string-append inner ".tar.gz")))
- (chdir inner)
- (chdir "src")
- ;; XXX The current patch system does not support unusual
- ;; source unpack methods, so we have to apply this patch in a
- ;; non-standard way.
- (zero? (system* "patch" "-p1" "--force" "-i"
- (assoc-ref %build-inputs "patch/init-fix"))))))
- (alist-replace
- 'check
- (lambda* (#:key inputs #:allow-other-keys #:rest args)
- (let ((perl (assoc-ref inputs "perl"))
- (check (assoc-ref %standard-phases 'check)))
- (substitute* "plugins/kdb/db2/libdb2/test/run.test"
- (("/bin/cat") (string-append perl "/bin/perl")))
- (substitute* "plugins/kdb/db2/libdb2/test/run.test"
- (("D/bin/sh") (string-append "D" (which "bash"))))
- (substitute* "plugins/kdb/db2/libdb2/test/run.test"
- (("bindir=/bin/.") (string-append "bindir=" perl "/bin")))
- ;; use existing files and directories in test
+ `(#:modules ((ice-9 ftw)
+ (ice-9 match)
+ (srfi srfi-1)
+ ,@%gnu-build-system-modules)
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (define (sub-directory? name)
+ (and (not (member name '("." "..")))
+ (equal? (stat:type (stat name))
+ 'directory)))
+ (and (zero? (system* "tar" "xvf" source))
+ (match (find-files "." "\\.tar\\.gz$")
+ ((inner-tar-file)
+ (zero? (system* "tar" "xvf" inner-tar-file))))
+ (match (scandir "." sub-directory?)
+ ((directory)
+ (chdir directory)
+ #t)))))
+
+ (add-after 'unpack 'apply-patches
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ (let ((patches (filter (match-lambda
+ ((name . file)
+ (string-prefix? "patch/" name)))
+ (or native-inputs inputs))))
+ (every (match-lambda
+ ((name . file)
+ (format (current-error-port)
+ "applying '~a'...~%" name)
+ (zero? (system* "patch" "-p1" "--force" "-i" file))))
+ patches))))
+
+ (add-after 'apply-patches 'enter-source-directory
+ (lambda _
+ (chdir "src")
+ #t))
+
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((perl (assoc-ref inputs "perl")))
+ (substitute* "plugins/kdb/db2/libdb2/test/run.test"
+ (("/bin/cat") (string-append perl "/bin/perl"))
+ (("D/bin/sh") (string-append "D" (which "bash")))
+ (("bindir=/bin/.") (string-append "bindir=" perl "/bin"))))
+
+ ;; avoid service names since /etc/services is unavailable
(substitute* "tests/resolve/Makefile"
(("-p telnet") "-p 23"))
- ;; avoid service names since /etc/services is unavailable
- (apply check args)))
- %standard-phases))))
+ #t)))))
(synopsis "MIT Kerberos 5")
(description
"Massachusetts Institute of Technology implementation of Kerberos.