guix-commits
[Top][All Lists]
Advanced

[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))



reply via email to

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