nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libarchive: Use 'modify-phases' syntax. 

* gnu/packages/backup.scm (libarchive)[arguments]: Use 'modify-phases'
syntax.
This commit is contained in:
Efraim Flashner 2017-10-01 21:32:24 +03:00
parent 7095760cb2
commit 4ac8d48640
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gnu/packages/backup.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -205,26 +206,25 @@ backups (called chunks) to allow easy burning to CD/DVD.")
("xz" ,xz))) ("xz" ,xz)))
(arguments (arguments
`(#:phases `(#:phases
(alist-cons-before (modify-phases %standard-phases
'build 'patch-pwd (add-before 'build 'patch-pwd
(lambda _ (lambda _
(substitute* "Makefile" (substitute* "Makefile"
(("/bin/pwd") (which "pwd")))) (("/bin/pwd") (which "pwd"))
(alist-replace #t)))
'check (replace 'check
(lambda _ (lambda _
;; XXX: The test_owner_parse, test_read_disk, and ;; XXX: The test_owner_parse, test_read_disk, and
;; test_write_disk_lookup tests expect user 'root' to exist, but ;; test_write_disk_lookup tests expect user 'root' to exist, but
;; the chroot's /etc/passwd doesn't have it. Turn off those tests. ;; the chroot's /etc/passwd doesn't have it. Turn off those tests.
;; ;;
;; The tests allow one to disable tests matching a globbing pattern. ;; The tests allow one to disable tests matching a globbing pattern.
(and (zero? (system* "make" (and (zero? (system* "make"
"libarchive_test" "bsdcpio_test" "bsdtar_test")) "libarchive_test" "bsdcpio_test" "bsdtar_test"))
;; XXX: This glob disables too much. ;; XXX: This glob disables too much.
(zero? (system* "./libarchive_test" "^test_*_disk*")) (zero? (system* "./libarchive_test" "^test_*_disk*"))
(zero? (system* "./bsdcpio_test" "^test_owner_parse")) (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
(zero? (system* "./bsdtar_test")))) (zero? (system* "./bsdtar_test"))))))
%standard-phases))
;; libarchive/test/test_write_format_gnutar_filenames.c needs to be ;; libarchive/test/test_write_format_gnutar_filenames.c needs to be
;; compiled with C99 or C11 or a gnu variant. ;; compiled with C99 or C11 or a gnu variant.
#:configure-flags '("CFLAGS=-O2 -g -std=c99"))) #:configure-flags '("CFLAGS=-O2 -g -std=c99")))