From unknown Thu Aug 14 18:37:00 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46096 <46096@debbugs.gnu.org> To: bug#46096 <46096@debbugs.gnu.org> Subject: Status: [PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint errors. Reply-To: bug#46096 <46096@debbugs.gnu.org> Date: Fri, 15 Aug 2025 01:37:00 +0000 retitle 46096 [PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint = errors. reassign 46096 guix-patches submitter 46096 L=C3=A9o Le Bouter severity 46096 normal tag 46096 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 25 05:51:46 2021 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= From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= To: guix-patches@gnu.org Subject: [PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint errors. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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)) -- 2.30.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 03 10:27:43 2021 Received: (at 46096-done) by debbugs.gnu.org; 3 Feb 2021 15:27:43 +0000 Received: from localhost ([127.0.0.1]:38616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7K4F-0003lG-0U for submit@debbugs.gnu.org; Wed, 03 Feb 2021 10:27:43 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:38046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7K4E-0003l3-6S for 46096-done@debbugs.gnu.org; Wed, 03 Feb 2021 10:27:42 -0500 Received: by mail-qk1-f180.google.com with SMTP id d85so9586qkg.5 for <46096-done@debbugs.gnu.org>; Wed, 03 Feb 2021 07:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=jxHL9ePHjkPhkrA1/ZlZzo5zcoweUFkv/Pax/vKhFnI=; b=HVoudSVtgWzBhl/APWL3QGpq7bbJ19gRcKiEfHOq7KxK23d4QPn8lXC/LST2fIZvGk ZyGfYD2mDBCsB+PpmQm2trE2sxCy6q73eOtoRSjPuKlX6ZjYUeD52jMJQ6xkiMdcqmzv mVHT+yotG9aaanPqkSZJ3uQZ04Jw0Ohit1etu0aEryn4dmjAGFjxje3liIClqwB1C/pA iFIvsEC9eRCrp4iwL+Qf3p/YhKuYse6vPIUi1xOOoz/v2WY0cP22Po3krH5+A4ElSXGU 6onlll0eAnngSEglVruGdTp+ic9Q/t82u7BW/rDewDBXPFTveKMGc3gFdRoT7ZAUkLDd fnUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=jxHL9ePHjkPhkrA1/ZlZzo5zcoweUFkv/Pax/vKhFnI=; b=ta7twxPyqZ+Gvg87Xi+0TPNrgYTpdvjPvRmZGG46c93kJiDjm8M3E4Du2vAEpilns6 W0j5LSwWnn7dKeoEFKDYsnaIi36JuZ2UgtDqxJiHPRe5Ro+8iHbElLoxOFjBCcAgHLHI HGzC6+F0DyC5roMJP3FQ7gOX7hTyZqe3aF+ejovzTzD/DwDzefEz7gTcw/4q+nNCu+/w ZrqRKLYSRKjrJGaArIkw0kHJvCET7WgrJq6Dq0Mxy+Ymv0TkkV2kmukJyGIt3POtDMMp xS+1X6w1y7GVAnHe7kxGrV605oqye0v55eeqlViKMS25ijkowCFrcq/KAQVrrxWWYpja uUsA== X-Gm-Message-State: AOAM530ipl2Pgz0jlYgwW1O3Nl4pojXKiKBeypjMlVmUPCit7sa2IDMS Iws6B6nu6xQI5lhz+Qz70vjXvZBpEm0= X-Google-Smtp-Source: ABdhPJyBW0EXpm5NYWIhks8Y3TqSZHiTjyVcqhFPhHSFUeJ3QZbbS8zFYIzikNuAIKK+qIWb+/K6Aw== X-Received: by 2002:a37:a955:: with SMTP id s82mr3048497qke.121.1612366056445; Wed, 03 Feb 2021 07:27:36 -0800 (PST) Received: from hurd (dsl-157-110.b2b2c.ca. [66.158.157.110]) by smtp.gmail.com with ESMTPSA id h63sm1556404qtd.14.2021.02.03.07.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:27:35 -0800 (PST) From: Maxim Cournoyer To: =?utf-8?Q?L=C3=A9o?= Le Bouter Subject: Re: bug#46096: [PATCH] gnu: make-mingw-w64: Use mirror:// link and fix lint errors. References: <20210125105121.15605-1-lle-bout@zaclys.net> Date: Wed, 03 Feb 2021 10:27:35 -0500 In-Reply-To: <20210125105121.15605-1-lle-bout@zaclys.net> (=?utf-8?Q?=22L?= =?utf-8?Q?=C3=A9o?= Le Bouter"'s message of "Mon, 25 Jan 2021 11:51:21 +0100") Message-ID: <874kitp3x4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 46096-done Cc: 46096-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, L=C3=A9o Le Bouter writes: > * 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 suppor= t 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 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6p= zxy85a")) > - (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-binu= tils triplet))) > + ("xbinutils" ,(if xbinutils xbinutils > + (cross-binutils triplet))) > ,@(if with-winpthreads? > - `(("xlibc" ,(make-mingw-w64 machine > - #:xgcc xgcc > - #:xbinutils xbi= nutils))) > + `(("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 "-cp= p"))) > (setenv "CROSS_C_INCLUDE_PATH" > (string-append > mingw-headers > @@ -96,11 +101,11 @@ specified, recurse and return a mingw-w64 with suppo= rt 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=3D-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK= =3D1") > #:tests? #f ; compiles and includes glibc headers > #:strip-binaries? #f)) Pushed as commit 88c635d96a1dfba90278dd9a3c2fcf523c74b55c, thank you. Maxim From unknown Thu Aug 14 18:37:00 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 04 Mar 2021 12:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator