[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".
- 08/18: gnu: Add texlive-abstract., (continued)
- 08/18: gnu: Add texlive-abstract., guix-commits, 2022/08/05
- 09/18: gnu: Add texlive-breqn., guix-commits, 2022/08/05
- 11/18: gnu: Add texlive-datatool., guix-commits, 2022/08/05
- 13/18: gnu: Add texlive-sourcesanspro., guix-commits, 2022/08/05
- 02/18: home: xdg: Use a single @ instead of @@., guix-commits, 2022/08/05
- 04/18: home: Use warning instead of display., guix-commits, 2022/08/05
- 01/18: disarchive-manifest: Filter out origins without a hash., guix-commits, 2022/08/05
- 10/18: gnu: Add texlive-comment., guix-commits, 2022/08/05
- 12/18: gnu: Add texlive-physics., guix-commits, 2022/08/05
- 16/18: gnu: mumps: Update to 5.5.1, guix-commits, 2022/08/05
- 06/18: gnu: openssl: Keep .dll.a files in main output.,
guix-commits <=
- 17/18: gnu: mumps: Add alternate source code URL., guix-commits, 2022/08/05
- 18/18: guix system: Remove unused 'read-operating-system' procedure., guix-commits, 2022/08/05
- 15/18: gnu: Add texlive-sourcecodepro., guix-commits, 2022/08/05
- 14/18: gnu: Add texlive-sourceserifpro., guix-commits, 2022/08/05