From patchwork Wed Jan 4 23:04:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 45856 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0187327BBE9; Wed, 4 Jan 2023 23:44:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5216227BBEB for ; Wed, 4 Jan 2023 23:44:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDDQR-00028n-9a; Wed, 04 Jan 2023 18:44:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pDDQQ-00028e-El for guix-patches@gnu.org; Wed, 04 Jan 2023 18:44:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pDDQP-0007rf-Sp for guix-patches@gnu.org; Wed, 04 Jan 2023 18:44:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDDQP-0000H6-PG for guix-patches@gnu.org; Wed, 04 Jan 2023 18:44:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60563] [PATCH 1/1] gnu: nettle: Fix mingw cross-compilation. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jan 2023 23:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60563 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60563@debbugs.gnu.org Received: via spool by 60563-submit@debbugs.gnu.org id=B60563.1672875784954 (code B ref 60563); Wed, 04 Jan 2023 23:44:01 +0000 Received: (at 60563) by debbugs.gnu.org; 4 Jan 2023 23:43:04 +0000 Received: from localhost ([127.0.0.1]:49864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDDPU-0000FJ-0S for submit@debbugs.gnu.org; Wed, 04 Jan 2023 18:43:04 -0500 Received: from planete-kraus.eu ([89.234.140.182]:50708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDDPR-0000Et-RD for 60563@debbugs.gnu.org; Wed, 04 Jan 2023 18:43:03 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a714d03c for <60563@debbugs.gnu.org>; Wed, 4 Jan 2023 23:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=l+GDd2Ccu0h8CN++fln3BY2YfAc=; b=Z0MqBB 9MNTNzDmDVBGYP+EX8KGwx3ejaE/NcBl5HV5QCNdtnw/mT+AeXi/oPdY0OYfVQ38 6g2QZHOjth7LKuw0O/Dt/6TKOOvsX5r+0/9HLHIHT8arEXAJx6PWIB3y4hoOUppE pecpSnp2hjrqugac1XWBl8d/boA5O8c+70d4U= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 428b548d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <60563@debbugs.gnu.org>; Wed, 4 Jan 2023 23:42:57 +0000 (UTC) Message-Id: In-Reply-To: References: Date: Thu, 5 Jan 2023 00:04:27 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))