me
/
guix
Archived
1
0
Fork 0
Code

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>
Vivien Kraus 2023-01-05 00:04:27 +01:00 committed by Ludovic Courtès
parent 88854b1a4e
commit b9d676e0ee
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/nettle.scm
View File

@ -44,7 +44,7 @@
(arguments (arguments
;; 'sexp-conv' and other programs need to have their RUNPATH point to ;; 'sexp-conv' and other programs need to have their RUNPATH point to
;; $libdir, which is not the case by default. Work around it. ;; $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") (assoc-ref %outputs "out")
"/lib")) "/lib"))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
@ -59,7 +59,13 @@
(rename-file ar (string-append (rename-file ar (string-append
slib "/" slib "/"
(basename ar)))) (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)))))) #t))))))
(outputs '("out" "debug" "static")) (outputs '("out" "debug" "static"))
(native-inputs (list m4)) (native-inputs (list m4))