mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libarchive: Enable zstd support.

Browse source 
CMake 3.15 has a test that expects zstd to be enabled.  It adds ~1 MiB to the
closure size.

* gnu/packages/backup.scm (libarchive)[inputs]: Add ZSTD:LIB.  Sort
alphabetically.
[arguments]: Adjust one of the zstd tests.  Adjust libarchive.pc.
This commit is contained in:
Marius Bakke 2019-07-21 17:18:22 +02:00
parent f73fe13ccd
commit 80ba43b5f8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/backup.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2019 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -212,12 +213,13 @@ (define-public libarchive
"0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6")))) "0pl25mmz1b1cnwf35kxmygyy9g7z7hslxbx329a9yx8csh7dahw6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("zlib" ,zlib) `(("bzip2" ,bzip2)
("nettle" ,nettle)
("lzo" ,lzo)
("bzip2" ,bzip2)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("xz" ,xz))) ("lzo" ,lzo)
("nettle" ,nettle)
("xz" ,xz)
("zlib" ,zlib)
("zstd" ,zstd "lib")))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -232,6 +234,13 @@ (define-public libarchive
;; 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.
;; ;;
;; XXX: Adjust test that fails with zstd 1.4.1 because the default
;; options compresses two bytes better than this test expects.
;; https://github.com/libarchive/libarchive/issues/1226
(substitute* "libarchive/test/test_write_filter_zstd.c"
(("compression-level\", \"6\"")
"compression-level\", \"7\""))
;; The tests allow one to disable tests matching a globbing pattern. ;; The tests allow one to disable tests matching a globbing pattern.
(invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test")
;; XXX: This glob disables too much. ;; XXX: This glob disables too much.
@ -246,6 +255,7 @@ (define-public libarchive
(libxml2 (assoc-ref inputs "libxml2")) (libxml2 (assoc-ref inputs "libxml2"))
(xz (assoc-ref inputs "xz")) (xz (assoc-ref inputs "xz"))
(zlib (assoc-ref inputs "zlib")) (zlib (assoc-ref inputs "zlib"))
(zstd (assoc-ref inputs "zstd"))
(bzip2 (assoc-ref inputs "bzip2"))) (bzip2 (assoc-ref inputs "bzip2")))
(substitute* (string-append lib "/pkgconfig/libarchive.pc") (substitute* (string-append lib "/pkgconfig/libarchive.pc")
(("-lnettle") (("-lnettle")
@ -256,6 +266,8 @@ (define-public libarchive
(string-append "-L" xz "/lib -llzma")) (string-append "-L" xz "/lib -llzma"))
(("-lz") (("-lz")
(string-append "-L" zlib "/lib -lz")) (string-append "-L" zlib "/lib -lz"))
(("-lzstd")
(string-append "-L" zstd "/lib -lzstd"))
(("-lbz2") (("-lbz2")
(string-append "-L" bzip2 "/lib -lbz2"))) (string-append "-L" bzip2 "/lib -lbz2")))
#t)))))) #t))))))