From patchwork Mon Jan 25 10:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 26633 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 134CC27BC1B; Mon, 25 Jan 2021 15:26:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5772727BC1A for ; Mon, 25 Jan 2021 15:26:48 +0000 (GMT) Received: from localhost ([::1]:47834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l43lP-00047P-Dp for patchwork@mira.cbaines.net; Mon, 25 Jan 2021 10:26:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3zTW-0006IJ-6g for guix-patches@gnu.org; Mon, 25 Jan 2021 05:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3zTV-0007sB-Uo for guix-patches@gnu.org; Mon, 25 Jan 2021 05:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3zTV-0003Cs-ST for guix-patches@gnu.org; Mon, 25 Jan 2021 05:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46096] [PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint errors. Resent-From: =?utf-8?q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jan 2021 10:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46096 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46096@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161157190612299 (code B ref -1); Mon, 25 Jan 2021 10:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jan 2021 10:51:46 +0000 Received: from localhost ([127.0.0.1]:38019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3zTG-0003CJ-0f for submit@debbugs.gnu.org; Mon, 25 Jan 2021 05:51:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:37198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3zTE-0003CA-2d for submit@debbugs.gnu.org; Mon, 25 Jan 2021 05:51:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3zTD-0006HO-Qr for guix-patches@gnu.org; Mon, 25 Jan 2021 05:51:43 -0500 Received: from mail.zaclys.net ([178.33.93.72]:47083) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3zTB-0007a0-3j for guix-patches@gnu.org; Mon, 25 Jan 2021 05:51:43 -0500 Received: from localhost.localdomain (lam21-1_migr-78-196-200-185.fbx.proxad.net [78.196.200.185] (may be forged)) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 10PApQQt041629 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 25 Jan 2021 11:51:38 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 10PApQQt041629 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1611571898; bh=xDS3+gXulstDVl+8Xy99x3icunJ3QWALFbNL/55ISAk=; h=From:To:Cc:Subject:Date:From; b=PGiTZEgxjhD0mi3i637QLVWOzDiV7tH8RO3IFYoU0X5CA0sqZp8THF9rKyQRSqI6r hLJZ1i+EpsQEK3cXaYGb6Of6Ojx2ftIgCkhVwexsHHdorJ6tPIqEkEI+Ch/Kxyd+5A 1/8a7HznQdYM3CwrZD56EWRsYSOdaNl24e8jGK+M= Date: Mon, 25 Jan 2021 11:51:21 +0100 Message-Id: <20210125105121.15605-1-lle-bout@zaclys.net> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Received-SPF: pass client-ip=178.33.93.72; envelope-from=lle-bout@zaclys.net; helo=mail.zaclys.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 25 Jan 2021 10:25:42 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: =?utf-8?q?L=C3=A9o?= Le Bouter X-ACL-Warn: , =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches X-Patchwork-Original-From: guix-patches--- via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches * gnu/package/mingw.scm (make-mingw-w64): Use mirror:// link instead of hardcoded sourceforge.net. Wrap lines 80 columns to fix lint warning. --- gnu/packages/mingw.scm | 49 +++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index b37f6c69bd..58f01ddc9f 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -46,23 +46,26 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) (version "7.0.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://sourceforge.net/projects/mingw-w64/files/mingw-w64/" - "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) - (sha256 - (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a")) - (patches - (search-patches "mingw-w64-6.0.0-gcc.patch" - "mingw-w64-dlltool-temp-prefix.patch" - "mingw-w64-reproducible-gendef.patch")))) + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/mingw-w64/mingw-w64/" + "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) + (sha256 + (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzxy85a")) + (patches + (search-patches "mingw-w64-6.0.0-gcc.patch" + "mingw-w64-dlltool-temp-prefix.patch" + "mingw-w64-reproducible-gendef.patch")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) - ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) + ("xbinutils" ,(if xbinutils xbinutils + (cross-binutils triplet))) ,@(if with-winpthreads? - `(("xlibc" ,(make-mingw-w64 machine - #:xgcc xgcc - #:xbinutils xbinutils))) + `(("xlibc" ,(make-mingw-w64 + machine + #:xgcc xgcc + #:xbinutils xbinutils))) '()))) (build-system gnu-build-system) (search-paths @@ -85,9 +88,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (add-before 'configure 'setenv (lambda* (#:key inputs #:allow-other-keys) (let ((xgcc-core (assoc-ref inputs "xgcc-core")) - (mingw-headers (string-append (getcwd) "/mingw-w64-headers"))) + (mingw-headers (string-append + (getcwd) "/mingw-w64-headers"))) (setenv "CPP" - (string-append xgcc-core ,(string-append "/bin/" triplet "-cpp"))) + (string-append + xgcc-core ,(string-append "/bin/" triplet "-cpp"))) (setenv "CROSS_C_INCLUDE_PATH" (string-append mingw-headers @@ -96,11 +101,11 @@ specified, recurse and return a mingw-w64 with support for winpthreads." ":" mingw-headers "/defaults/include" ":" mingw-headers "/direct-x/include")) (when ,with-winpthreads? - (let ((xlibc (assoc-ref inputs "xlibc"))) - (setenv "CROSS_LIBRARY_PATH" - (string-append - xlibc "/lib" ":" - xlibc "/" ,triplet "/lib")))))))) + (let ((xlibc (assoc-ref inputs "xlibc"))) + (setenv "CROSS_LIBRARY_PATH" + (string-append + xlibc "/lib" ":" + xlibc "/" ,triplet "/lib")))))))) #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") #:tests? #f ; compiles and includes glibc headers #:strip-binaries? #f))