From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 60563@debbugs.gnu.org
Subject: [bug#60563] [PATCH 1/1] gnu: nettle: Fix mingw cross-compilation.
Date: Thu, 5 Jan 2023 00:04:27 +0100 [thread overview]
Message-ID: <f328720ab29bada6e9652684842074b47125c7e6.1672875360.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1672875360.git.vivien@planete-kraus.eu>
* gnu/packages/nettle.scm (nettle-2) [move-static-libraries]: .dll.a files are
not static libraries.
---
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 @@ (define-public nettle-2
(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 @@ (define-public nettle-2
(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))
--
2.38.1
next prev parent reply other threads:[~2023-01-04 23:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 23:36 [bug#60563] [PATCH 0/1] Fix mingw cross-compilation of nettle Vivien Kraus via Guix-patches via
2023-01-04 23:04 ` Vivien Kraus via Guix-patches via [this message]
2023-01-19 16:31 ` bug#60563: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f328720ab29bada6e9652684842074b47125c7e6.1672875360.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=60563@debbugs.gnu.org \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).