Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:27:42 2024
Received: from localhost ([127.0.0.1]:42092 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sJX01-0005bj-QS
for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:42 -0400
Received: from mail-wm1-f52.google.com ([209.85.128.52]:49512)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1sJWzv-0005af-Gs
for 71630 <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:36 -0400
Received: by mail-wm1-f52.google.com with SMTP id
5b1f17b1804b1-421f4d1c057so41912905e9.3
for <71630 <at> debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundation.xyz; s=google; t=1718709987; x=1719314787; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=ZmWNbJIAZQQQJtDbzPoaQgBmm2nP5zplrEceAicQuhg=;
b=hVxVGBnRuemAEKq4WXIFifTIK5X247GlN270qQH5ZYtqRLe9bO7q3DaHniZOTtAxvK
4CpdpSQMgZtpLG3YNvWci5B77KtmfYvgje3Adf7uUUxMsD26FxcdYrpJvIZIXMfL4115
0PCz1X4mFD+KGyKoYmLY1cO+l/b+RFe+DokTVGBM9UFThg04QJxXy+xW+5NRQ0Jmwz25
6Xj96kKtwFNyxR7iZrGrTz/fOUGVqYcZvPkNW9TuwA3LeAFElFXCTPWFiu7Lb7Kxca+1
mHfV3dMJhnvS0XiNbKQXVmdptv5Lj6i0vv7rVfCoavrkJPZoc6y5VPUzGbO/JDqMDCId
LQwg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718709987; x=1719314787;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=ZmWNbJIAZQQQJtDbzPoaQgBmm2nP5zplrEceAicQuhg=;
b=kAW6E9MFG0V9l4wK5eAZWarfP13vS5b91S54IQ7pGFed4qi0bB0P0OL3m0pO4pe6UU
/5gNomnE/nd5f3bG7tv9PH6tcObAiX8M5rF2HjnUZZsSo9HfE/ek3iojjiolFu48Cowa
NpdN2BWCADmVicvhwgQgOtPpdEXHR5SPH1XM/xpQofZmqr53zMkQpRCVmOdw4t7BryIu
FbCydbZ7zwbqVVgkXyHTB8J66ocF4IgbG5ZZE5arpax3NQHIWqM09YHjxH5TWqWPrpSF
tZ+O7MRtYtCISNmlcR0HpFWNkl/4IgGQ3W7SCioE+Q4eP0XYbRxGG9nmJYXjupBNCsTB
X7ag==
X-Gm-Message-State: AOJu0YwgRI3swjxYAN5Rg9YeIUuUR0MamqA+wnf45OyC9cY3oJkXaevg
A4HwQKVrRfJtlvzrCmmkcdLLUrJIBCHDQcrNn/liu2gfFayM6NnwimXMoPwmNw0frH9rfpzfbc9
f
X-Google-Smtp-Source: AGHT+IEWh+MVz0x2yYciQ7lOW5oZrk54hGNqJERG/DffeP/Tr7dvzh8ZfdXWS3FtyyT7RNmlyuHaIg==
X-Received: by 2002:a05:600c:1616:b0:421:7bed:5274 with SMTP id
5b1f17b1804b1-42304820c5fmr117928325e9.10.1718709987132;
Tue, 18 Jun 2024 04:26:27 -0700 (PDT)
Received: from jeandudey.home ([89.131.29.87])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 18 Jun 2024 04:26:26 -0700 (PDT)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 71630 <at> debbugs.gnu.org
Subject: [PATCH 5/5] gnu: mingw-w64-tools: Update to 12.0.0.
Date: Tue, 18 Jun 2024 13:26:17 +0200
Message-ID: <10acc10bd882a163c7676fc30e45d668a0d15e80.1718708756.git.jean@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1718708756.git.jean@HIDDEN>
References: <cover.1718708756.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71630
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mingw.scm (mingw-w64-tools): Update to 12.0.0.
Change-Id: Ia9060ddb1795ca2941a13435485841dbee0c1200
---
gnu/packages/mingw.scm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 88a2db2141..89e08be9ac 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -151,7 +151,7 @@ (define-public mingw-w64 mingw-w64-i686)
(define-public mingw-w64-tools
(package
(name "mingw-w64-tools")
- (version "11.0.1")
+ (version "12.0.0")
(source
(origin
(method url-fetch)
@@ -159,7 +159,7 @@ (define-public mingw-w64-tools
"mirror://sourceforge/mingw-w64/mingw-w64/"
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
- (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz"))))
+ (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc"))))
(build-system gnu-build-system)
(arguments
(list
@@ -176,10 +176,6 @@ (define-public mingw-w64-tools
(replace 'unpack
(lambda _
(chdir "../genidl"))))
- (modify-phases %standard-phases
- (replace 'unpack
- (lambda _
- (chdir "../genlib"))))
(modify-phases %standard-phases
(replace 'unpack
(lambda _
--
2.45.1
guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.
Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:27:37 2024
Received: from localhost ([127.0.0.1]:42090 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sJWzx-0005bT-AJ
for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:37 -0400
Received: from mail-lj1-f170.google.com ([209.85.208.170]:52442)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1sJWzu-0005ad-GL
for 71630 <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:35 -0400
Received: by mail-lj1-f170.google.com with SMTP id
38308e7fff4ca-2eaae2a6dc1so94098761fa.0
for <71630 <at> debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundation.xyz; s=google; t=1718709986; x=1719314786; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=rzu+OGGXIs3XBgkzQUIe5auY6LhECV7vsjk50dzrqFo=;
b=mltSHa0Oko1TbL0SVim4uZU1pQTeqtmQ5vK9OfQajBSNaPWcR2+qPKfrQNphFuZRPE
Plhx67NGbLvcbq5IG15SKjkwPqSPLZQ1AdSeWgkcCcFhm3nyOVDGJeoznR7vxCcf9+s6
GnVtVrrub+mPNgM1FWqzMr6Vj3eeF7iJqHS1tPffv1KW4ByDfWX8HFFeXUkRV1dmgwYU
erZAjIWPiE37SyTf7xEJ4LmXHZoBD1t4Xk/57X8tumLse7i8802NgH4rYg5ycjkMn1zI
yrc/dWcO/YmrxwVcvfE74NF7z1p3nXsPC8ehdFyh0YSlkvoZi/vHm8Ft48OxoO6F2zvN
Didw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718709986; x=1719314786;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=rzu+OGGXIs3XBgkzQUIe5auY6LhECV7vsjk50dzrqFo=;
b=qj6b13g9iOaY2btZqAJsZ5UMDCA0YaK+7fubShTjNKsynRtVgUphQc6Pa5FPye79Yy
eizi9t6gdwbmkgAM+E+wpU6BOTouDwLBI12Z3d00eBbaeemFcH7IKtGKo/hY+NbGGtBq
BMiKi4J40qE3dMaaVB3Dd+jq1xyA8QhmNAYvICXZzLc/56IyDmuskHYZg8mHsvPp7AvG
DTNDIPNlqXlXdPlxwNYJfyUOOu4O3Zktx+Y+U1+v1YKnLF98l8ArznHhXKeCJK5+31TI
g7zzfwZquyA6U5/Eo9luzk2E403wJhg1lNPqycTLW8N72NWaJpA++oqPzHhK/DG7qOFb
G3Kw==
X-Gm-Message-State: AOJu0Yzk7yikEbohyfXjXSGTocIIuekzvovQlQrHd83xZW+B5slgvmKi
4if+hMT0gNm3c2Z60DuZNGCxdkgVrQbtuIuLSpUTHMlK30PmddWz6oaykMZ6Fjc794ToW6fuMvB
1
X-Google-Smtp-Source: AGHT+IHCLrp3WjVQ9CgCKkLieuna5lkV2MC2SEjwSdupaiwxBhG0XEeTWXAr2Q6l8ZxhOg90r3XG9Q==
X-Received: by 2002:a2e:890a:0:b0:2ea:e74c:40a2 with SMTP id
38308e7fff4ca-2ec0e4826ccmr89687881fa.20.1718709985709;
Tue, 18 Jun 2024 04:26:25 -0700 (PDT)
Received: from jeandudey.home ([89.131.29.87])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.25
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 18 Jun 2024 04:26:25 -0700 (PDT)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 71630 <at> debbugs.gnu.org
Subject: [PATCH 4/5] gnu: mingw-w64-tools: Use G-Expressions.
Date: Tue, 18 Jun 2024 13:26:16 +0200
Message-ID: <344b2e60dc52efd6d6f9a09181f045e2daa50702.1718708756.git.jean@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1718708756.git.jean@HIDDEN>
References: <cover.1718708756.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71630
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mingw.scm (mingw-w64-tools): Use G-Expressions.
Change-Id: I690d0aeae6c6920d2e3eb43732d6b421a3dfc59b
---
gnu/packages/mingw.scm | 70 +++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index e2fb84ce63..88a2db2141 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -162,45 +162,45 @@ (define-public mingw-w64-tools
(base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz"))))
(build-system gnu-build-system)
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1))
+ (list
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1))
#:phases
- (append
- (modify-phases %standard-phases
- (add-after 'unpack 'cd-gendef
- (lambda _
- (chdir "mingw-w64-tools/gendef"))))
- (modify-phases %standard-phases
- (replace 'unpack
- (lambda _
- (chdir "../genidl"))))
- (modify-phases %standard-phases
- (replace 'unpack
- (lambda _
- (chdir "../genlib"))))
- (modify-phases %standard-phases
- (replace 'unpack
- (lambda _
- (chdir "../genpeimg"))))
- (append-map
- (lambda (target)
+ #~(append
+ (modify-phases %standard-phases
+ (add-after 'unpack 'cd-gendef
+ (lambda _
+ (chdir "mingw-w64-tools/gendef"))))
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda _
+ (chdir "../genidl"))))
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda _
+ (chdir "../genlib"))))
(modify-phases %standard-phases
(replace 'unpack
(lambda _
- (chdir "../widl")
- (false-if-exception
- (delete-file-recursively "../build"))
- #t))
- (replace 'configure
- (lambda args
- (apply (assoc-ref %standard-phases 'configure)
- (append args (list #:out-of-source? #t
- #:configure-flags
- `("--target" ,target
- "--program-prefix"
- ,(string-append target "-")))))))))
- '("i686-w64-mingw32" "x86_64-w64-mingw32")))))
+ (chdir "../genpeimg"))))
+ (append-map
+ (lambda (target)
+ (modify-phases %standard-phases
+ (replace 'unpack
+ (lambda _
+ (chdir "../widl")
+ (false-if-exception
+ (delete-file-recursively "../build"))))
+ (replace 'configure
+ (lambda args
+ (apply (assoc-ref %standard-phases 'configure)
+ (append args (list #:out-of-source? #t
+ #:configure-flags
+ `("--target" ,target
+ "--program-prefix"
+ ,(string-append target "-")))))))))
+ '("i686-w64-mingw32" "x86_64-w64-mingw32")))))
(home-page "https://mingw-w64.org")
(synopsis "Tools of Minimalist GNU for Windows")
(description "This package provides the tools of Minimalist GNU for
--
2.45.1
guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.
Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:27:37 2024
Received: from localhost ([127.0.0.1]:42088 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sJWzw-0005bL-H7
for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:37 -0400
Received: from mail-lf1-f49.google.com ([209.85.167.49]:57356)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1sJWzt-0005ab-2u
for 71630 <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:34 -0400
Received: by mail-lf1-f49.google.com with SMTP id
2adb3069b0e04-52bc035a7ccso5598660e87.2
for <71630 <at> debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundation.xyz; s=google; t=1718709984; x=1719314784; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=oPjr3clDVHxsE9TfnVL7+h4zkHfJWpqFVPFr4/xbJZM=;
b=UwL7uqSv4ZfW+dgVXTLopioCkEh7zDrSCysEiR+lq0T4d9av9VhI8VxtnhRWUx6pTZ
fFOgZoiMuguZtmX1fgsCU8El2xd4C8ZFLFnOyNssvSxIOt+y0MUBBD6oMjSBYCHhnkEi
grmybAD6pigigMhTD9RIgVFLzd1hmueWWNLsU8GkwIkhM4oBNI3P2WDBtrNQbRsH6VYI
CuWdE76xzGXffMTDHOMJ26Ng0CCfdXdZR6tg9H+9xwfGPxMZKpQqmp8ndFemTYfRRQ6b
RO79vRE9PN/iTDI9o9uPGqoAkKD0o6Tkl4gKYwRWpZeZexrFhXJs5fn18Gp/BQSXXLV6
y+yw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718709984; x=1719314784;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=oPjr3clDVHxsE9TfnVL7+h4zkHfJWpqFVPFr4/xbJZM=;
b=n4Ho4Btj3Kk6qL+Tm8RRPMh5ugmIQiHAIgMXGyyPACxo0MV6DMWavrDTG9G7tsQJ0C
tj4XcSKlZh1KCpxKhmxxi7cx1+K/xAuxtyyyB/Iz+m1tAP39qLYXo1IUCkUk+xKGkax4
wZFbzYbelh4epsUy0uSj+m2fw5daLKB1g9BIYziUS/YlbWAo+tce0ZU/MpAjw6ofZn9e
GYgBdQHiGEGymjeBPzgLjvSliYj7IFhiwy3FcdzLU5JFpyojfkX/e90EpU0bQVb64mdA
3/aGHJYTE8Dh+sQXZkdN5rKv+0fjIselffpXEdADPZGa6va7IOqU/3+faUxECPlFTVb+
hd9g==
X-Gm-Message-State: AOJu0YycNIWJUDTTRgfi6IBxVGq7RMKQzUIRtPWaCnxe4WAnuyjGgUIy
LjVQGoXngqr4DlFc2m8sDJgIGeC/f5rDjJdMEan4Dz1uSmEukYJVYNwVK9Eyt3HGKhe+UIae4Z/
X
X-Google-Smtp-Source: AGHT+IHPJtlwa0qaOgVsXRQFCXNkAtHGxT7NkOOO3upAFeJ5wZWtVT7OHjdfUov/OObvAcZaKZqXXQ==
X-Received: by 2002:a05:6512:517:b0:52b:796e:66a5 with SMTP id
2adb3069b0e04-52ca6e9954cmr6598930e87.66.1718709984302;
Tue, 18 Jun 2024 04:26:24 -0700 (PDT)
Received: from jeandudey.home ([89.131.29.87])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 18 Jun 2024 04:26:24 -0700 (PDT)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 71630 <at> debbugs.gnu.org
Subject: [PATCH 3/5] gnu: make-mingw-w64: Update to 12.0.0.
Date: Tue, 18 Jun 2024 13:26:15 +0200
Message-ID: <d53fe6581af2e775bc338a2e873e665771173593.1718708756.git.jean@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1718708756.git.jean@HIDDEN>
References: <cover.1718708756.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71630
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mingw.scm (make-mingw-w64): Update to 12.0.0.
* gnu/packages/patches/mingw-w64-6.0.0-gcc.patch: Delete patch.
* gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: Delete patch.
* gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Delete patch.
* gnu/local.mk: Unregister patches.
Change-Id: Id9d7d17926280b21016a7217da44004e06e436cd
---
gnu/local.mk | 2 -
gnu/packages/mingw.scm | 17 +++--
.../patches/mingw-w64-6.0.0-gcc.patch | 65 -------------------
.../mingw-w64-dlltool-temp-prefix.patch | 26 --------
.../mingw-w64-reproducible-gendef.patch | 33 ----------
5 files changed, 10 insertions(+), 133 deletions(-)
delete mode 100644 gnu/packages/patches/mingw-w64-6.0.0-gcc.patch
delete mode 100644 gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch
delete mode 100644 gnu/packages/patches/mingw-w64-reproducible-gendef.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index c5c9ff48bb..0deb1ee071 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1731,8 +1731,6 @@ dist_patch_DATA = \
%D%/packages/patches/mia-vtk92.patch \
%D%/packages/patches/mia-vtk-version.patch \
%D%/packages/patches/mingw-w64-6.0.0-gcc.patch \
- %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \
- %D%/packages/patches/mingw-w64-reproducible-gendef.patch \
%D%/packages/patches/minisat-friend-declaration.patch \
%D%/packages/patches/minisat-install.patch \
%D%/packages/patches/miniz-for-pytorch.patch \
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 825a784e0d..e2fb84ce63 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -43,7 +43,7 @@ (define* (make-mingw-w64/implementation machine
(package
(name (string-append "mingw-w64" "-" machine
(if with-winpthreads? "-winpthreads" "")))
- (version "11.0.1")
+ (version "12.0.0")
(source
(origin
(method url-fetch)
@@ -51,11 +51,7 @@ (define* (make-mingw-w64/implementation machine
"mirror://sourceforge/mingw-w64/mingw-w64/"
"mingw-w64-release/mingw-w64-v" version ".tar.bz2"))
(sha256
- (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz"))
- (patches
- (search-patches "mingw-w64-6.0.0-gcc.patch"
- "mingw-w64-dlltool-temp-prefix.patch"
- "mingw-w64-reproducible-gendef.patch"))))
+ (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc"))))
(native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet)))
("xbinutils" ,(if xbinutils xbinutils
(cross-binutils triplet)))
@@ -84,7 +80,14 @@ (define* (make-mingw-w64/implementation machine
#~(list #$(string-append "--host=" triplet)
#$@(if with-winpthreads?
#~("--with-libraries=winpthreads")
- #~()))
+ #~())
+ ;; The default msvcrt changed on 12.0.0 to use UCRT as the
+ ;; default, this could cause problems with programs expecting
+ ;; MSVCRT as the default.
+ ;;
+ ;; XXX: A new target to use UCRT can be introduced as
+ ;; the MSYS2 project does, e.g: x86_64-w64-ucrt-mingw32.
+ "--with-default-msvcrt=msvcrt")
#:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
#:phases
#~(modify-phases %standard-phases
diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch
deleted file mode 100644
index 036cf79f91..0000000000
--- a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-This patch includes
-
- * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3
- * mingw-w64-headers/crt/math.h: Likewise
- * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add
- symbols.
- * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK):
- Add symbols.
- (lstat): Add function.
- * mingw-w64-headers/crt/_mingw_stat64.h: Likewise
- * mingw-w64-headers/crt/stdlib.h (realpath): Add function.
-
-Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6.
-
-Upstream status: not yet presented upstream.
-
-diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
-index 5874f4e..bdf4ead 100644
---- a/mingw-w64-headers/crt/float.h
-+++ b/mingw-w64-headers/crt/float.h
-@@ -22,6 +22,15 @@
- #if (__GNUC__ < 4)
- #error Corrupt install of gcc-s internal headers, or search order was changed.
- #else
-+
-+ /* From gcc-4.9.3 float.h. */
-+ #undef FLT_EPSILON
-+ #undef DBL_EPSILON
-+ #undef LDBL_EPSILON
-+ #define FLT_EPSILON __FLT_EPSILON__
-+ #define DBL_EPSILON __DBL_EPSILON__
-+ #define LDBL_EPSILON __LDBL_EPSILON__
-+
- /* #include_next <float_ginclude.h> */
-
- /* Number of decimal digits, q, such that any floating-point number with q
-diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
-index 1e970f4..99a332f 100644
---- a/mingw-w64-headers/crt/math.h
-+++ b/mingw-w64-headers/crt/math.h
-@@ -216,6 +216,7 @@ extern "C" {
- #endif
- }
-
-+#if 0
- __CRT_INLINE long double __cdecl fabsl (long double x)
- {
- #ifdef __arm__
-@@ -226,6 +227,7 @@ extern "C" {
- return res;
- #endif
- }
-+#endif
-
- __CRT_INLINE double __cdecl fabs (double x)
- {
-@@ -905,7 +907,7 @@ __mingw_choose_expr ( \
- /* 7.12.7.3 */
- extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */
- extern float __cdecl hypotf (float x, float y);
--#ifndef __CRT__NO_INLINE
-+#if 0 //ndef __CRT__NO_INLINE
- __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);}
- #endif
- extern long double __cdecl hypotl (long double, long double);
diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch
deleted file mode 100644
index 432cafc162..0000000000
--- a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This following patch was originally found at the debian mingw-w64 team's
-mingw-w64 repo located here:
-https://salsa.debian.org/mingw-w64-team/mingw-w64.git
-
-Invoke the following in the aforementioned repo to see the original patch:
-
- $ git show 4974e2c:debian/patches/dlltool-temp-prefix.patch
-
-Description: Specify dlltool's temp prefix
-Author: Stephen Kitt <steve@HIDDEN>
-
-By default dlltool uses its pid for the object files it generates.
-Enforcing its temp prefix allows the files it generates to be
-reproducible.
-
---- a/mingw-w64-crt/Makefile.am
-+++ b/mingw-w64-crt/Makefile.am
-@@ -36,7 +36,7 @@
- DTDEF32=$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS)
- DTDEF64=$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS)
- else
-- AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@
-+ AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ --temp-prefix $$(basename $@ .a)
- DLLTOOLFLAGSARM32=-m arm
- DLLTOOLFLAGSARM64=-m arm64
- DLLTOOLFLAGS32=--as-flags=--32 -m i386
diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
deleted file mode 100644
index 8dbea54ce9..0000000000
--- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This following patch was originally found at the debian mingw-w64 team's
-mingw-w64 repo located here:
-https://salsa.debian.org/mingw-w64-team/mingw-w64.git
-
-Invoke the following in the aforementioned repo to see the original patch:
-
- $ git show 9a33f50:debian/patches/reproducible-build.patch
-
-Description: Drop __DATE__ from gendef and genlib
-Author: Stephen Kitt <skitt@HIDDEN>
-
-This allows gendef and genlib to be built reproducibly.
-
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -196,7 +196,6 @@
- " By default, the output files are named after their DLL counterparts\n"
- " gendef MYDLL.DLL Produces MYDLL.def\n"
- " gendef - MYDLL.DLL Prints the exports to stdout\n");
-- fprintf (stderr, "\nBuilt on %s\n", __DATE__);
- fprintf (stderr, "\nReport bugs to <mingw-w64-public@HIDDEN>\n");
- exit (0);
- }
---- a/mingw-w64-tools/genlib/src/genlib.c
-+++ b/mingw-w64-tools/genlib/src/genlib.c
-@@ -123,7 +123,6 @@
- "Usage example:\n"
- " By default, the output file is named after the DLL counterpart\n"
- " genlib mydef.def Produces libmydll.a\n"
--"\nBuilt on " __DATE__ "\n"
- "\nReport bugs to <martellmalone@HIDDEN>\n"
- ;
-
--
2.45.1
guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.
Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:36 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:27:36 2024
Received: from localhost ([127.0.0.1]:42086 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sJWzw-0005bD-0O
for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:36 -0400
Received: from mail-lj1-f176.google.com ([209.85.208.176]:46233)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1sJWzs-0005aZ-0N
for 71630 <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:32 -0400
Received: by mail-lj1-f176.google.com with SMTP id
38308e7fff4ca-2ec0f3b9cfeso47242631fa.0
for <71630 <at> debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundation.xyz; s=google; t=1718709983; x=1719314783; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=FleaWH3pNmqoLlL+sqr36+E7x0WmXHkdQN1O3J4bAzQ=;
b=AvNAIrtrxnGbx43ypQf/N14NiINC8FjpN0se7VbRwMiJP74LVdpXx6K/a+ZpxnOrMe
CsNzPG/8PM4p7f5kLXGCDhxF9KAXYZPe95Xy6Nq/6JTomMuZ9a7+KodXxwlTaUTaeBtN
gD3Z6c7nmRvTlouBqMeECI9CYb2eJ7FUObKL73FA+TJORoLQcENrC1egymrQpM5oECaL
gR7aa/7p5nsM0NXnKEXz49ySbu8MuTKSEyG96QB+77ZbKhfTqjUFRLXiLX/6mmgbMMBh
AzKY7L/ov8qubPKpUY5b8UwuVlyPMPBDuiXPNQlceQASIosZaf+zeG54H+hYshE8pcqH
ggZA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718709983; x=1719314783;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=FleaWH3pNmqoLlL+sqr36+E7x0WmXHkdQN1O3J4bAzQ=;
b=eXXv7ZCMl1tm6+oaAC8cUj7KM2T8MdX7sQ1VW8+GXdOA7XR3FUdp1Zq7/aDHbi5Xt4
9+Z+B2M9C9l1F3Zw0DPogBFQcd9XR9QVSXWEvTLUTMPUOrh35wOgFiFx9K/0ouq0VxiC
GQsSO4eJoPNsLMmNiRqNhSt/GPIRkow7EQ/3k9YYPDzh+aaz2DMkQ3xYk9rJu/0WvxXw
f69+utQSujHabF6/GMAkT8FX39tAt3aXLBiMzUtV/0o/7L24bzt2JXAl1dEQmdgULLM/
jdMwkjUNY4KGSbFkHOi6l6OQtTAZqYaXC14fK196KFgcwpKGf6Nt3pTUT+CW/438QHaR
sf/Q==
X-Gm-Message-State: AOJu0YyC/wUyxKfCtVW6CIdVATlSl4m0gqRvHSUk7PEuOY8/qP014pDo
YsgiwBYCNRQQWF4bdk3EbhwZqLOKuPBnJsBKBeQLIdiA4nSLbIpcSOtig4QgkFsJPGHaX3sFmLw
s
X-Google-Smtp-Source: AGHT+IEskcLpDkErBtVT3l2ks4QrHAXWARths2OrLS9AwZmYBOeO5qZUKir6PBBlHNlrnrDooiGrvQ==
X-Received: by 2002:a05:6512:15a5:b0:52c:c13e:fedd with SMTP id
2adb3069b0e04-52cc13eff46mr2472742e87.21.1718709982919;
Tue, 18 Jun 2024 04:26:22 -0700 (PDT)
Received: from jeandudey.home ([89.131.29.87])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 18 Jun 2024 04:26:22 -0700 (PDT)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 71630 <at> debbugs.gnu.org
Subject: [PATCH 2/5] gnu: make-mingw-w64: Use G-Expressions.
Date: Tue, 18 Jun 2024 13:26:14 +0200
Message-ID: <b96c2c9f775536446d22c17d2388679260999dff.1718708756.git.jean@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1718708756.git.jean@HIDDEN>
References: <cover.1718708756.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71630
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mingw.scm (make-mingw-w64): Use G-Expressions and
move some arguments above phases.
Change-Id: Ie095dceac635f19f146895c8e3f36d9889108a9a
---
gnu/packages/mingw.scm | 67 +++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 1ef2c5e1cf..825a784e0d 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -25,6 +25,7 @@ (define-module (gnu packages mingw)
#:use-module (gnu packages)
#:use-module (gnu packages cross-base)
#:use-module (guix build-system gnu)
+ #:use-module (guix gexp)
#:use-module (guix memoization)
#:use-module (guix packages)
#:use-module (guix download)
@@ -76,37 +77,41 @@ (define* (make-mingw-w64/implementation machine
,(string-append triplet "/lib")
,(string-append triplet "/lib64"))))))
(arguments
- `(#:configure-flags '(,(string-append "--host=" triplet)
- ,@(if with-winpthreads?
- '("--with-libraries=winpthreads")
- '()))
- #:phases
- (modify-phases %standard-phases
- (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")))
- (setenv "CPP"
- (string-append
- xgcc-core ,(string-append "/bin/" triplet "-cpp")))
- (setenv "CROSS_C_INCLUDE_PATH"
- (string-append
- mingw-headers
- ":" mingw-headers "/include"
- ":" mingw-headers "/crt"
- ":" 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"))))))))
- #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
- #:parallel-build? #f ; parallel builds often fail with empty .a files
- #:tests? #f ; compiles and includes glibc headers
- #:strip-binaries? #f))
+ (list #:parallel-build? #f ; parallel builds often fail with empty .a files
+ #:tests? #f ; compiles and includes glibc headers
+ #:strip-binaries? #f
+ #:configure-flags
+ #~(list #$(string-append "--host=" triplet)
+ #$@(if with-winpthreads?
+ #~("--with-libraries=winpthreads")
+ #~()))
+ #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'setenv
+ (lambda _
+ (let ((xgcc-core #+(this-package-native-input
+ "xgcc-core"))
+ (mingw-headers (string-append
+ (getcwd) "/mingw-w64-headers")))
+ (setenv "CPP"
+ (string-append
+ xgcc-core "/bin/" #$triplet "-cpp"))
+ (setenv "CROSS_C_INCLUDE_PATH"
+ (string-append
+ mingw-headers
+ ":" mingw-headers "/include"
+ ":" mingw-headers "/crt"
+ ":" mingw-headers "/defaults/include"
+ ":" mingw-headers "/direct-x/include"))
+ #$@(if with-winpthreads?
+ #~((let ((xlibc #+(this-package-native-input
+ "xlibc")))
+ (setenv "CROSS_LIBRARY_PATH"
+ (string-append
+ xlibc "/lib" ":"
+ xlibc "/" #$triplet "/lib"))))
+ #~())))))))
(home-page "https://mingw-w64.org")
(synopsis "Minimalist GNU for Windows")
(description
--
2.45.1
guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.
Received: (at 71630) by debbugs.gnu.org; 18 Jun 2024 11:27:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:27:33 2024
Received: from localhost ([127.0.0.1]:42081 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sJWzs-0005an-Hi
for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:32 -0400
Received: from mail-lj1-f179.google.com ([209.85.208.179]:45354)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <jean@HIDDEN>) id 1sJWzq-0005aU-21
for 71630 <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:27:31 -0400
Received: by mail-lj1-f179.google.com with SMTP id
38308e7fff4ca-2eaa89464a3so60591451fa.3
for <71630 <at> debbugs.gnu.org>; Tue, 18 Jun 2024 04:27:27 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=foundation.xyz; s=google; t=1718709981; x=1719314781; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=RSD4TiUTxA6v1+jqcyrLmTwezJy1VjlI6O32FTYASho=;
b=Oc6RRTs43fG7kwjZ3CbpCVqgFLG07WxwjoauXGT9NzU59cZZOtsR9+57svu3BC9Mki
PGqgOVBfeFVD36c6YmyeqlvjAX89yunwvJTCl1WDT6PyUQ3QxfkSC1Sd8tYAdxmOChXG
KlQgPv4esEbcUAEkgTVTiuVltC8wkeRXfrsmvLCwpyGoZkwEnU64X1g/q0/UDdBiLBDS
fwTdwAJOYtrZQXOkz0ouNIoN/6d5qLQ52dlLYgNwuzUE1JELtDmbOXgH2II7BC7V6flA
P5h3cEQg5mIxqBrDQRK1XSp31jzYqEKahP4Fp+dFF9lAzwFuHZolJTkgJzMlk6+l7TmH
fCmw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1718709981; x=1719314781;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=RSD4TiUTxA6v1+jqcyrLmTwezJy1VjlI6O32FTYASho=;
b=IzbTalFObFgvKHBrDO2YWdyzw1U4eoB044hi9eTmZKnd+LohxQ/OQzcjjHFi366ZeB
TwhIJ1eIUQF43QmOyJhK2Z1hcv1GCUfGsAaqTN/Ye9Jr27XUmVyMooU2LLftoRoshOTz
nrn+KOTlKskOU8bEgir/HDzzUl17gPAIjoy6SA1IFHldIMSYXpaiG0lc4qyclfMtA8AH
gRD/kZ+DO4NpkLhFEQo4Zerbc6rO5QAd8hKmzEn7i+FHnOCx13QQ7PPYAkdHht4htQ+D
jrQx+wKwAO0Vja8TA8VipBw1Gen96xiXwWwslIZR3Pn8LuWoZd5pgyoMkYZZC5wo8VC5
Gkcw==
X-Gm-Message-State: AOJu0Yz7/wtUsLdLriWW7J34/H9T8IG8VQNOGii1o/ibmt4OeEvYAG/u
Z67fRj6BD2yJlXdXR8/oX2IkkqmU7JWUIjw7XY4SJ+9zPiv8rL6KM1QRyj6eFL6kedk9FQSXaUA
m
X-Google-Smtp-Source: AGHT+IG60fg13YZtusjL6AQEW7yu4CyJXVW2PMizgLH3PqMmtVQWdbVL2sEk0lSSpp91gDHJoaR7NQ==
X-Received: by 2002:a2e:964c:0:b0:2ea:ea79:4fa6 with SMTP id
38308e7fff4ca-2ec0e6004fbmr88653121fa.36.1718709981197;
Tue, 18 Jun 2024 04:26:21 -0700 (PDT)
Received: from jeandudey.home ([89.131.29.87])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-422f602ee95sm189825945e9.13.2024.06.18.04.26.20
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 18 Jun 2024 04:26:20 -0700 (PDT)
From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
To: 71630 <at> debbugs.gnu.org
Subject: [PATCH 1/5] gnu: make-mingw-w64: Memoize.
Date: Tue, 18 Jun 2024 13:26:13 +0200
Message-ID: <a73cfbc431f42313869cef8bad3557ba3730ae85.1718708756.git.jean@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <cover.1718708756.git.jean@HIDDEN>
References: <cover.1718708756.git.jean@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71630
Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/mingw.scm (make-mingw-w64): Memoize.
Change-Id: Id5653c79e2d6268f6d8200f0f658b27169eab7c5
---
gnu/packages/mingw.scm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm
index 0ac6f0e767..1ef2c5e1cf 100644
--- a/gnu/packages/mingw.scm
+++ b/gnu/packages/mingw.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@HIDDEN>
;;; Copyright © 2019 Carl Dong <contact@HIDDEN>
;;; Copyright © 2021 Léo Le Bouter <lle-bout@HIDDEN>
+;;; Copyright © 2024 Foundation Devices, Inc. <hello@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,15 +25,16 @@ (define-module (gnu packages mingw)
#:use-module (gnu packages)
#:use-module (gnu packages cross-base)
#:use-module (guix build-system gnu)
+ #:use-module (guix memoization)
#:use-module (guix packages)
#:use-module (guix download)
#:export (make-mingw-w64))
-(define* (make-mingw-w64 machine
- #:key
- xgcc
- xbinutils
- with-winpthreads?)
+(define* (make-mingw-w64/implementation machine
+ #:key
+ xgcc
+ xbinutils
+ with-winpthreads?)
"Return a mingw-w64 for targeting MACHINE. If XGCC or XBINUTILS is specified,
use that gcc or binutils when cross-compiling. If WITH-WINPTHREADS? is
specified, recurse and return a mingw-w64 with support for winpthreads."
@@ -119,6 +121,9 @@ (define* (make-mingw-w64 machine
several new APIs such as DirectX and DDK, and 64-bit support.")
(license license:fdl1.3+))))
+(define make-mingw-w64
+ (memoize make-mingw-w64/implementation))
+
(define-public mingw-w64-i686
(make-mingw-w64 "i686"))
--
2.45.1
guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 18 Jun 2024 11:18:05 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 18 07:18:05 2024 Received: from localhost ([127.0.0.1]:42059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sJWqj-0005Lx-AJ for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:18:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:37530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jean@HIDDEN>) id 1sJWqe-0005LW-PG for submit <at> debbugs.gnu.org; Tue, 18 Jun 2024 07:18:04 -0400 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 <jean@HIDDEN>) id 1sJWqX-0006Qz-6a for guix-patches@HIDDEN; Tue, 18 Jun 2024 07:17:57 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <jean@HIDDEN>) id 1sJWqS-0005xX-Se for guix-patches@HIDDEN; Tue, 18 Jun 2024 07:17:52 -0400 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-52c89d6b4adso4823029e87.3 for <guix-patches@HIDDEN>; Tue, 18 Jun 2024 04:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1718709465; x=1719314265; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=gQ6gzvlRDIolxjAI5SbXuUEde4QtUSUAmg1LczpVjHA=; b=X1IKzL4+1RkB4CCvLKfr+nseLivrR9DON6yRyhuinCRPjn9hbb+Clqb9uwSfThDI2Z ianESI1WzEcpRgqTIEJpyx8dbNC+Y6eSIi25/cqc8vfaVPYXYW/M/iyyfMbhl+7+v9tg iUyzjjwE21YMJAvSdfrNEl63S4uhob4DmKBoSMziI5LgoMhi27uYfYx0hyh1mCl+Uy/W Okxger/J1Y7Wig5pSGOQ0Kc/uZNomXkLfMV2l0eXRV4dHx9oANy2W4a1i0bi4Z3Wzk19 BR6cqCG/uF+9eBQ6W0P3Y2feRnZJO0O/dK5rsgQcpp0vzIsInkkrZNw8oFHnTANxqMKe MLzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718709465; x=1719314265; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gQ6gzvlRDIolxjAI5SbXuUEde4QtUSUAmg1LczpVjHA=; b=lpYONA5KpqP7/IQM32nvC7J3Q7T2gbuGu4Jn81N2t3HHOrI1r8lQlmoHYxJdds+kOJ ugddm7qBf8dPhWd5W0bv1h/BCQ9x6DUIGY5R1GaE44a1m+QGrByEquMu3NnnVqZf9lqv JUETfsq07bqV5Sx9+56HMCGcGu1y4xCn5SNbF+xSGJaIUuBemY2v1ZaCYxbrSQZuM60a rgrLkZ+Gxg7e7D39Ho5h1F+Bt9Ra6mwBAkuviwnOhu7Dj6JGmXz/ymcMG4i8qsBib1pp GM3sunZY78o6R0uzyAgHuOms434dlT6wsYcmFooM/dMkKghPSxjgIWGSFwj5E9FHqhmv nGBg== X-Gm-Message-State: AOJu0Yx26B+RhkcJRKPOs7AslCVICVTOvHu72f0oBEUKKcMCp503IxsT Ec9de683IVLVNWM4vvPnpYcw0TtP164p5ZYKkO4aZ7WJAAXspGm5fLHprskX0/xgfUCpAryPALh G X-Google-Smtp-Source: AGHT+IF81GEQqBY9I8C4ASz/YgzfMeuZsK/aERieKL2cDFopYpOdx3CDGctwv0hnAeB+V16/dGH80w== X-Received: by 2002:ac2:4c12:0:b0:52c:82fa:ef7b with SMTP id 2adb3069b0e04-52ca6e909e2mr6299065e87.44.1718709464806; Tue, 18 Jun 2024 04:17:44 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3607509c7e5sm14009326f8f.30.2024.06.18.04.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jun 2024 04:17:44 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ <jean@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/5] gnu: make-mingw-w64: Update to 12.0.0. Date: Tue, 18 Jun 2024 13:17:41 +0200 Message-ID: <cover.1718708756.git.jean@HIDDEN> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=jean@HIDDEN; helo=mail-lf1-x134.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Jean-Pierre De Jesus DIAZ <jean@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) This patchset updates MinGW package to the latest version 12.0.0. I've added a new configure flag to set the default MSVCRT to MSVCRT as the default now is UCRT. This default is also changed by Debian, other projects like MSYS2 use a different target triplet for UCRT which is now the default and could be introduced if necessary on GNU Guix. Some of the patches present don't apply anymore to MinGW so I've removed these and the genlib tool has been removed in the 12.0.0 release so I've removed the phases that built that tool. (and for anyone wondering, llvm-dlltool replaces it). Also I've took the liberty of using G-Expressions where possible in the package definitions. I've checked the signatures of the released tarball and it verifies correctly, although, it is the first time I trust the signers public key: $ sha256sum mingw-w64-v12.0.0.tar.bz2.sig mingw-w64-v12.0.0.tar.bz2 b2d94b4d9a9afe69626e3c7b6c5876c4aa998a74c5e4209b0c357f86d2785861 mingw-w64-v12.0.0.tar.bz2.sig cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f mingw-w64-v12.0.0.tar.bz2 gpg: WARNING: no command supplied. Trying to guess what you mean ... gpg: assuming signed data in 'mingw-w64-v12.0.0.tar.bz2' gpg: Signature made Wed 29 May 2024 04:39:22 AM CEST gpg: using DSA key CAF5641F74F7DFBA88AE205693BDB53CD4EBC740 gpg: issuer "jon_y@HIDDEN" gpg: Good signature from "JonY <jon_y@HIDDEN>" [unknown] gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Primary key fingerprint: CAF5 641F 74F7 DFBA 88AE 2056 93BD B53C D4EB C740 Jean-Pierre De Jesus DIAZ (5): gnu: make-mingw-w64: Memoize. gnu: make-mingw-w64: Use G-Expressions. gnu: make-mingw-w64: Update to 12.0.0. gnu: mingw-w64-tools: Use G-Expressions. gnu: mingw-w64-tools: Update to 12.0.0. gnu/local.mk | 2 - gnu/packages/mingw.scm | 167 +++++++++--------- .../patches/mingw-w64-6.0.0-gcc.patch | 65 ------- .../mingw-w64-dlltool-temp-prefix.patch | 26 --- .../mingw-w64-reproducible-gendef.patch | 33 ---- 5 files changed, 88 insertions(+), 205 deletions(-) delete mode 100644 gnu/packages/patches/mingw-w64-6.0.0-gcc.patch delete mode 100644 gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch delete mode 100644 gnu/packages/patches/mingw-w64-reproducible-gendef.patch base-commit: 2aeb37def258ad4dd23aaf57ed32f0be44d1bea5 -- 2.45.1
Jean-Pierre De Jesus DIAZ <jean@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#71630; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.