guix-commits
[Top][All Lists]
Advanced

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

15/19: gnu: bzip2: Do not retain a reference to the bootstrap bzip.


From: guix-commits
Subject: 15/19: gnu: bzip2: Do not retain a reference to the bootstrap bzip.
Date: Thu, 5 Mar 2020 18:10:20 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 8e98f750e63e8723db0361f4e3e960193278fa47
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Mar 5 18:08:50 2020 +0100

    gnu: bzip2: Do not retain a reference to the bootstrap bzip.
    
    * gnu/packages/compression.scm (bzip2)[arguments]: Add phase
    'hide-input-bzip2'.
---
 gnu/packages/compression.scm | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index b2edca4..9ccb34a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice 
<address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2016, 2019 Kei Kebreau <address@hidden>
-;;; Copyright © 2016, 2018, 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2018, 2019, 2020 Marius Bakke <address@hidden>
 ;;; Copyright © 2017 ng0 <address@hidden>
 ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <address@hidden>
 ;;; Copyright © 2017 Theodoros Foradis <address@hidden>
@@ -275,6 +275,22 @@ file; as a result, it is often used in conjunction with 
\"tar\", resulting in
                   (srfi srfi-1))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'set-paths 'hide-input-bzip2
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((bzip2 (assoc-ref inputs "bzip2")))
+               (if bzip2
+                   ;; Prevent the build system from retaining a reference to
+                   ;; BZIP2 from INPUTS.
+                   (begin
+                     (setenv "LIBRARY_PATH"
+                             (string-join (delete (string-append bzip2 "/lib")
+                                                  (string-split (getenv 
"LIBRARY_PATH")
+                                                                #\:))
+                                          ":"))
+                     (format #t "environment variable `LIBRARY_PATH' set to 
`~a'~%"
+                             (getenv "LIBRARY_PATH")))
+                   (format #t "no bzip2 found, nothing done~%"))
+               #t)))
          (replace 'configure
            (lambda* (#:key target #:allow-other-keys)
              (when ,(%current-target-system)



reply via email to

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