* [PATCH 2/4] gnu: Add libarchive.
@ 2014-05-29 21:39 Eric Bavier
2014-05-30 15:54 ` Ludovic Courtès
2014-05-31 14:36 ` Ludovic Courtès
0 siblings, 2 replies; 3+ messages in thread
From: Eric Bavier @ 2014-05-29 21:39 UTC (permalink / raw)
To: Guix-devel
[-- Attachment #1: 0002-gnu-Add-libarchive.patch --]
[-- Type: text/x-diff, Size: 3563 bytes --]
From 27002e7928daec6192bc683863ed21736309af22 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Thu, 29 May 2014 16:35:45 -0500
Subject: [PATCH 2/4] gnu: Add libarchive.
* gnu/packages/compression.scm (libarchive): New variable.
---
gnu/packages/compression.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index c832807..31b0430 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,8 @@
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
+ #:use-module (gnu packages nettle)
+ #:use-module (gnu packages xml)
#:use-module (gnu packages which))
(define-public zlib
@@ -315,3 +318,57 @@ archives that can be readily emailed. A shell archive is a file that can be
processed by a Bourne-type shell to unpack the original collection of files.
This package is mostly for compatibility and historical interest.")
(license license:gpl3+)))
+
+(define-public libarchive
+ (package
+ (name "libarchive")
+ (version "3.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://libarchive.org/downloads/libarchive-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb"))))
+ (build-system gnu-build-system)
+ (inputs
+ `(("zlib" ,zlib)
+ ("nettle" ,nettle)
+ ("lzo" ,lzo)
+ ("bzip2" ,bzip2)
+ ("libxml2" ,libxml2)
+ ("xz" ,xz)))
+ (arguments
+ `(#:phases
+ (alist-cons-before
+ 'build 'patch-pwd
+ (lambda _
+ (substitute* "Makefile"
+ (("/bin/pwd") (which "pwd"))))
+ (alist-replace
+ 'check
+ (lambda _
+ ;; XXX: The test_owner_parse, test_read_disk, and
+ ;; 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 tests allow one to disable tests matching a globbing pattern.
+ (and (zero? (system* "make"
+ "libarchive_test" "bsdcpio_test" "bsdtar_test"))
+ ;; XXX: This glob disables too much.
+ (zero? (system* "./libarchive_test" "^test_*_disk*"))
+ (zero? (system* "./bsdcpio_test" "^test_owner_parse"))
+ (zero? (system* "./bsdtar_test"))))
+ %standard-phases))))
+ (home-page "http://libarchive.org/")
+ (synopsis "Multi-format archive and compression library")
+ (description
+ "Libarchive provides a flexible interface for reading and writing
+archives in various formats such as tar and cpio. Libarchive also supports
+reading and writing archives compressed using various compression filters such
+as gzip and bzip2. The library is inherently stream-oriented; readers
+serially iterate through the archive, writers serially add things to the
+archive. In particular, note that there is currently no built-in support for
+random access nor for in-place modification.")
+ (license license:bsd-2)))
--
1.7.9.5
[-- Attachment #2: Type: text/plain, Size: 17 bytes --]
--
Eric Bavier
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] gnu: Add libarchive.
2014-05-29 21:39 [PATCH 2/4] gnu: Add libarchive Eric Bavier
@ 2014-05-30 15:54 ` Ludovic Courtès
2014-05-31 14:36 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2014-05-30 15:54 UTC (permalink / raw)
To: Eric Bavier; +Cc: Guix-devel
Eric Bavier <ericbavier@gmail.com> skribis:
> From 27002e7928daec6192bc683863ed21736309af22 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 29 May 2014 16:35:45 -0500
> Subject: [PATCH 2/4] gnu: Add libarchive.
>
> * gnu/packages/compression.scm (libarchive): New variable.
LGTM!
Ludo'.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] gnu: Add libarchive.
2014-05-29 21:39 [PATCH 2/4] gnu: Add libarchive Eric Bavier
2014-05-30 15:54 ` Ludovic Courtès
@ 2014-05-31 14:36 ` Ludovic Courtès
1 sibling, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2014-05-31 14:36 UTC (permalink / raw)
To: Eric Bavier; +Cc: Guix-devel
Eric Bavier <ericbavier@gmail.com> skribis:
> From 27002e7928daec6192bc683863ed21736309af22 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Thu, 29 May 2014 16:35:45 -0500
> Subject: [PATCH 2/4] gnu: Add libarchive.
>
> * gnu/packages/compression.scm (libarchive): New variable.
I’ve just moved libarchive to a different module, because pulling in the
nettle and xml modules from there led to circular references (noticeable
by running ‘make clean-go && make’.)
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-31 14:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-29 21:39 [PATCH 2/4] gnu: Add libarchive Eric Bavier
2014-05-30 15:54 ` Ludovic Courtès
2014-05-31 14:36 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).