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

gnu: libarchive: Add '-L' flags in 'libarchive.pc'. 

* gnu/packages/backup.scm (libarchive)[arguments]: Add
'add--L-in-libarchive-pc' phase.
This commit is contained in:
Ludovic Courtès 2018-03-29 17:37:17 +02:00
parent 5576cfabf3
commit 5294836d6a
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/backup.scm
View File

@ -204,7 +204,6 @@ backups (called chunks) to allow easy burning to CD/DVD.")
(base32 (base32
"1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd")))) "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; TODO: Add -L/path/to/nettle in libarchive.pc.
(inputs (inputs
`(("zlib" ,zlib) `(("zlib" ,zlib)
("nettle" ,nettle) ("nettle" ,nettle)
@ -231,7 +230,29 @@ backups (called chunks) to allow easy burning to CD/DVD.")
;; XXX: This glob disables too much. ;; XXX: This glob disables too much.
(invoke "./libarchive_test" "^test_*_disk*") (invoke "./libarchive_test" "^test_*_disk*")
(invoke "./bsdcpio_test" "^test_owner_parse") (invoke "./bsdcpio_test" "^test_owner_parse")
(invoke "./bsdtar_test")))) (invoke "./bsdtar_test")))
(add-after 'install 'add--L-in-libarchive-pc
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(nettle (assoc-ref inputs "nettle"))
(libxml2 (assoc-ref inputs "libxml2"))
(xz (assoc-ref inputs "xz"))
(zlib (assoc-ref inputs "zlib"))
(bzip2 (assoc-ref inputs "bzip2")))
(substitute* (string-append lib "/pkgconfig/libarchive.pc")
(("-lnettle")
(string-append "-L" nettle "/lib -lnettle"))
(("-lxml2")
(string-append "-L" libxml2 "/lib -lxml2"))
(("-llzma")
(string-append "-L" xz "/lib -llzma"))
(("-lz")
(string-append "-L" zlib "/lib -lz"))
(("-lbz2")
(string-append "-L" bzip2 "/lib -lbz2")))
#t))))
;; 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")))