[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: gnu: nettle: Fix mingw cross-compilation.
From: |
guix-commits |
Subject: |
04/11: gnu: nettle: Fix mingw cross-compilation. |
Date: |
Thu, 19 Jan 2023 11:57:17 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit b9d676e0ee7b52ef4bb202507ccc94b5cab590b2
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Thu Jan 5 00:04:27 2023 +0100
gnu: nettle: Fix mingw cross-compilation.
* gnu/packages/nettle.scm (nettle-2) [move-static-libraries]: .dll.a files
are
not static libraries.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/nettle.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm
index 27bd9efc60..ea26ba3b2d 100644
--- a/gnu/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@ -44,7 +44,7 @@
(arguments
;; 'sexp-conv' and other programs need to have their RUNPATH point to
;; $libdir, which is not the case by default. Work around it.
- '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
+ `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))
#:phases (modify-phases %standard-phases
@@ -59,7 +59,13 @@
(rename-file ar (string-append
slib "/"
(basename ar))))
- (find-files "." "\\.a$")))
+ (find-files
+ "."
+ ,(if (target-mingw?)
+ '(lambda (filename _)
+ (and (string-suffix? ".a"
filename)
+ (not (string-suffix?
".dll.a" filename))))
+ "\\.a$"))))
#t))))))
(outputs '("out" "debug" "static"))
(native-inputs (list m4))
- branch master updated (26bb41d6d5 -> 3846ceec4e), guix-commits, 2023/01/19
- 01/11: gnu: guile-next: Add '.tarball-version' file to get correct version., guix-commits, 2023/01/19
- 03/11: gnu: gnulib: Refer to "gcc" as provided via implicit package inputs., guix-commits, 2023/01/19
- 07/11: gnu: python-greenlet: Update to 2.0.1., guix-commits, 2023/01/19
- 06/11: gnu: Fix home-page typos, guix-commits, 2023/01/19
- 04/11: gnu: nettle: Fix mingw cross-compilation.,
guix-commits <=
- 05/11: gnu: hledger: Install documentation., guix-commits, 2023/01/19
- 02/11: gnu: guile-next: Really depend on self., guix-commits, 2023/01/19
- 09/11: gnu: python-eventlet: Manage broken tests with nosetests., guix-commits, 2023/01/19
- 08/11: gnu: python-gevent: Update to 22.10.2., guix-commits, 2023/01/19
- 11/11: gnu: Add petri-foo., guix-commits, 2023/01/19
- 10/11: gnu: python-eventlet: Exclude broken test., guix-commits, 2023/01/19