[bug#60563] [PATCH 0/1] Fix mingw cross-compilation of nettle

[bug#60563] [PATCH 0/1] Fix mingw cross-compilation of nettle

[Vivien Kraus via Guix-patches via]

Dear guix,

nettle separates its static library output from its main output by moving all
files with a ".a" extension. However, doing that also moves the ".dll.a" files
on mingw. These files are required to link against a DLL. Packages that want
to link against the nettle DLL will require the default output of nettle, and
will not want the static output. So, these files must stay in the default
output.

Best regards,

Vivien

Vivien Kraus (1):
  gnu: nettle: Fix mingw cross-compilation.

 gnu/packages/nettle.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


base-commit: 658c09333da095edf6e1b3c5e351a7bfa3c87354
-- 
2.38.1

[bug#60563] [PATCH 1/1] gnu: nettle: Fix mingw cross-compilation.

[Vivien Kraus via Guix-patches via]

* 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

bug#60563: [PATCH 0/1] Fix mingw cross-compilation of nettle

[Ludovic Courtès]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> skribis:

> * gnu/packages/nettle.scm (nettle-2) [move-static-libraries]: .dll.a files are
> not static libraries.

Applied, thanks!

Ludo’.