guix-commits
[Top][All Lists]
Advanced

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

06/18: gnu: openssl: Keep .dll.a files in main output.


From: guix-commits
Subject: 06/18: gnu: openssl: Keep .dll.a files in main output.
Date: Fri, 5 Aug 2022 09:28:55 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit e167044fad6a233196a930d943ad9b687431e8d7
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Fri Aug 5 09:52:21 2022 +0200

    gnu: openssl: Keep .dll.a files in main output.
    
    * gnu/packages/tls.scm (openssl) [phase move-static-libraries]: Do not move
    .dll.a files to the static output when targetting mingw.
    
    Signed-off-by: Ludovic Court├Ęs <ludo@gnu.org>
---
 gnu/packages/tls.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1e527ecce2..4ee75ace3d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -507,7 +507,13 @@ OpenSSL for TARGET."
                (for-each (lambda (file)
                            (install-file file slib)
                            (delete-file file))
-                         (find-files lib "\\.a$")))))
+                         (find-files
+                          lib
+                          #$(if (target-mingw?)
+                                '(lambda (filename _)
+                                   (and (string-suffix? ".a" filename)
+                                        (not (string-suffix? ".dll.a" 
filename))))
+                                "\\.a$"))))))
          (add-after 'install 'move-extra-documentation
            (lambda _
              ;; Move man pages and full HTML documentation to "doc".



reply via email to

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