guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/06: gnu: cryptsetup-static: Don't build veritysetup.


From: guix-commits
Subject: 05/06: gnu: cryptsetup-static: Don't build veritysetup.
Date: Sat, 5 Oct 2019 06:00:03 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit b5c84b8a37aa268c370ad9c1cf335e5b6c1b3420
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Oct 4 12:30:47 2019 +0200

    gnu: cryptsetup-static: Don't build veritysetup.
    
    * gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Pass
    ‘--disable-veritysetup’ #:configure-flag.  Adjust ‘remove-cruft’ phase.
---
 gnu/packages/cryptsetup.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index aae1082..8425135 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
 ;;; Copyright © 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -81,6 +82,8 @@ files).  This assumes LIBRARY uses Libtool."
      '(#:configure-flags '("--disable-shared"
                            "--enable-static-cryptsetup"
 
+                           "--disable-veritysetup"
+
                            ;; 'libdevmapper.a' pulls in libpthread, libudev 
and libm.
                            "LIBS=-ludev -pthread -lm")
 
@@ -94,8 +97,7 @@ files).  This assumes LIBRARY uses Libtool."
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'remove-cruft
                     (lambda* (#:key outputs #:allow-other-keys)
-                      ;; Remove everything except the 'cryptsetup' command and
-                      ;; its friend.
+                      ;; Remove everything except the 'cryptsetup' command.
                       (let ((out (assoc-ref outputs "out")))
                         (with-directory-excursion out
                           (let ((dirs (scandir "."
@@ -109,7 +111,7 @@ files).  This assumes LIBRARY uses Libtool."
                                                                     ".static")
                                                      file)
                                         (remove-store-references file))
-                                      '("sbin/cryptsetup" "sbin/veritysetup"))
+                                      '("sbin/cryptsetup"))
                             #t))))))))
     (inputs
      (let ((libgcrypt-static



reply via email to

[Prev in Thread] Current Thread [Next in Thread]