branch master updated: gnu: sbcl-osicat: Fix library path.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ambrevar pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 192177b  gnu: sbcl-osicat: Fix library path.
192177b is described below

commit 192177b04974f456a081e7cb9177e7d9147f822c
Author: Pierre Neidhardt <address@hidden>
AuthorDate: Thu Apr 30 16:56:44 2020 +0200

    gnu: sbcl-osicat: Fix library path.
    
    * gnu/packages/lisp-xyz.scm (sbcl-osicat)[arguments]: Replace 'cleanup phase
      to preserve the location of libosicat.so so that it can be found when
      loading the system.
---
 gnu/packages/lisp-xyz.scm | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c2029d9..b032346 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11533,21 +11533,19 @@ MOP easier to use.")
       (arguments
        `(#:phases
          (modify-phases %standard-phases
-           (add-before 'validate-runpath 'cleanup-files
+           ;; The cleanup phase moves files around but we need to keep the
+           ;; directory structure for the grovel-generated library.
+           (replace 'cleanup
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))
-                      (lib (string-append out "/lib/sbcl")))
-                 (for-each
-                  delete-file
-                  (filter (lambda (file)
-                            (not (member (basename file)
-                                         '("basic-unixint__grovel"
-                                           "libosicat.so"
-                                           "osicat--system.fasl"
-                                           "osicat.asd"
-                                           "unixint__grovel"))))
-                          (find-files lib ".*")))
-                 #t))))))
+                      (lib (string-append out "/lib/sbcl/")))
+                 (delete-file-recursively (string-append lib "src"))
+                 (delete-file-recursively (string-append lib "tests"))
+                 (for-each delete-file
+                           (filter (lambda (file)
+                                     (not (member (basename file) 
'("libosicat.so"))))
+                                   (find-files (string-append lib "posix") 
".*"))))
+               #t)))))
       (inputs
        `(("alexandria" ,sbcl-alexandria)
          ("cffi" ,sbcl-cffi)