[PATCH] gnu: mingw: Update reproducibility patch

  • Done
  • quality assurance status badge
Details
3 participants
  • Michael Ford
  • Janneke Nieuwenhuizen
  • Christopher Baines
Owner
unassigned
Submitted by
Michael Ford
Severity
normal
M
M
Michael Ford wrote on 9 Aug 2023 15:09
(address . guix-patches@gnu.org)
CAFyhPjWraxM2faJtR+p1ifk9x5++byTE35H1DzAj43wtNv2ViA@mail.gmail.com
From c8e8b7dacfe86147226a687acd495e59826368d7 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Wed, 9 Aug 2023 14:42:38 +0200
Subject: [PATCH] gnu: mingw: Update reproducibility patch

* gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Update from
upstream.
---
.../patches/mingw-w64-reproducible-gendef.patch | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
index ee676af7a0..39ee854245 100644
--- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
+++ b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch
@@ -4,12 +4,12 @@ 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/reproducible-gendef.patch
+ $ git show 9a33f50:debian/patches/reproducible-build.patch

-Description: Drop __DATE__ from gendef
+Description: Drop __DATE__ from gendef and genlib
Author: Stephen Kitt <skitt@debian.org>

-This allows gendef to be built reproducibly.
+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
@@ -21,3 +21,13 @@ This allows gendef to be built reproducibly.
fprintf (stderr, "\nReport bugs to <
mingw-w64-public@lists.sourceforge.net>\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@gmail.com>\n"
+ ;
+
--
2.41.0
Attachment: file
J
J
Janneke Nieuwenhuizen wrote on 19 Aug 2023 09:50
(name . Michael Ford)(address . fanquake@gmail.com)(address . 65179@debbugs.gnu.org)
87350flbdi.fsf@gnu.org
Michael Ford writes:

Hi!

Toggle quote (10 lines)
> From c8e8b7dacfe86147226a687acd495e59826368d7 Mon Sep 17 00:00:00 2001
> From: fanquake <fanquake@gmail.com>
> Date: Wed, 9 Aug 2023 14:42:38 +0200
> Subject: [PATCH] gnu: mingw: Update reproducibility patch.
> * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Update from
> upstream.
> ---
> .../patches/mingw-w64-reproducible-gendef.patch | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)

Applied, thanks!

However...even with this patch MinGW does not build reproducibly, e.g.

Toggle snippet (15 lines)
diffoscope /gnu/store/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a /tmp/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
--- /gnu/store/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
+++ /tmp/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
??? file list
? @@ -1,4 +1,4 @@
? ----------- 0 0 0 100 2023-08-18 13:26:59.000000 /
? --rw-r--r-- 0 999 30000 586 2023-08-18 13:26:59.000000 libntoct.o
? --rw-r--r-- 0 999 30000 648 2023-08-18 13:26:59.000000 libntoch.o
? --rw-r--r-- 0 999 30000 624 2023-08-18 13:26:59.000000 libntocs00000.o
? +---------- 0 0 0 100 2023-08-19 06:04:15.000000 /
? +-rw-r--r-- 0 999 30000 586 2023-08-19 06:04:15.000000 libntoct.o
? +-rw-r--r-- 0 999 30000 648 2023-08-19 06:04:15.000000 libntoch.o
? +-rw-r--r-- 0 999 30000 624 2023-08-19 06:04:15.000000 libntocs00000.o

Would you like to look into that?

Greetings,
Janneke

--
Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com| Avatar® https://AvatarAcademy.com
M
M
Michael Ford wrote on 21 Aug 2023 10:54
(name . Janneke Nieuwenhuizen)(address . janneke@gnu.org)(address . 65179@debbugs.gnu.org)
CAFyhPjUwmJMZJ-thmDSHw+mcP=ChudyfqaK7Y7FGgx+1t_3A_g@mail.gmail.com
Toggle quote (2 lines)
> Would you like to look into that?

Sure, I'll see if I can track down the issue.

On Sat, 19 Aug 2023 at 08:50, Janneke Nieuwenhuizen <janneke@gnu.org> wrote:

Toggle quote (55 lines)
> Michael Ford writes:
>
> Hi!
>
> > From c8e8b7dacfe86147226a687acd495e59826368d7 Mon Sep 17 00:00:00 2001
> > From: fanquake <fanquake@gmail.com>
> > Date: Wed, 9 Aug 2023 14:42:38 +0200
> > Subject: [PATCH] gnu: mingw: Update reproducibility patch.
> > * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Update from
> > upstream.
> > ---
> > .../patches/mingw-w64-reproducible-gendef.patch | 16 +++++++++++++---
> > 1 file changed, 13 insertions(+), 3 deletions(-)
>
> Applied, thanks!
>
> However...even with this patch MinGW does not build reproducibly, e.g.
>
> --8<---------------cut here---------------start------------->8---
> diffoscope
> /gnu/store/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
> /tmp/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
> ---
> /gnu/store/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
> +++
> /tmp/ra40ckd09sapzlh7mib2qmwkbjamgcxb-mingw-w64-x86_64-11.0.1/lib/libntoc.a
> ??? file list
> ? @@ -1,4 +1,4 @@
> ? ----------- 0 0 0 100 2023-08-18 13:26:59.000000 /
> ? --rw-r--r-- 0 999 30000 586 2023-08-18 13:26:59.000000
> libntoct.o
> ? --rw-r--r-- 0 999 30000 648 2023-08-18 13:26:59.000000
> libntoch.o
> ? --rw-r--r-- 0 999 30000 624 2023-08-18 13:26:59.000000
> libntocs00000.o
> ? +---------- 0 0 0 100 2023-08-19 06:04:15.000000 /
> ? +-rw-r--r-- 0 999 30000 586 2023-08-19 06:04:15.000000
> libntoct.o
> ? +-rw-r--r-- 0 999 30000 648 2023-08-19 06:04:15.000000
> libntoch.o
> ? +-rw-r--r-- 0 999 30000 624 2023-08-19 06:04:15.000000
> libntocs00000.o
> --8<---------------cut here---------------end--------------->8---
>
> Would you like to look into that?
>
> Greetings,
> Janneke
>
> --
> Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond
> https://LilyPond.org
> Freelance IT https://www.JoyOfSource.com | Avatar®
> https://AvatarAcademy.com
>
Attachment: file
C
C
Christopher Baines wrote on 30 Oct 2023 14:08
Re: [bug#65179] [PATCH] gnu: mingw: Update reproducibility patch
(address . 65179-done@debbugs.gnu.org)
87h6m8w92l.fsf@cbaines.net
Janneke Nieuwenhuizen <janneke@gnu.org> writes:

Toggle quote (16 lines)
> Michael Ford writes:
>
> Hi!
>
>> From c8e8b7dacfe86147226a687acd495e59826368d7 Mon Sep 17 00:00:00 2001
>> From: fanquake <fanquake@gmail.com>
>> Date: Wed, 9 Aug 2023 14:42:38 +0200
>> Subject: [PATCH] gnu: mingw: Update reproducibility patch.
>> * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: Update from
>> upstream.
>> ---
>> .../patches/mingw-w64-reproducible-gendef.patch | 16 +++++++++++++---
>> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> Applied, thanks!

Since this patch has been applied, I'm going to mark the issue as done.

You can always open an issue against the guix package if you want to
track this problem with mingw.

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmU/qxJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdY+Q//ZRyXDaS0JiNrCCJSclAoLYOchDg8g760
HFM3POHHmzYmhPLEPSg7Bntow2cbtNuoTL6YAGtXZ9UGTzmuqTUzI2h8XHGdeh/d
EBSOPO7+LFyuSiO+l0WnGKS4l5caWfmHeMeeAfcfl4ySUBTG05r1xpVdipT+2wRk
GQAw8y2SSn+gEo3V6XjCEUxW0C+Q4++mL6j3TjYztXFCktxuXHv1V8N9uwQf4+Lg
ey3Wt4VW+hLhHYLpFkA+H52O6MT+Hr/deXk/JckW3/d+YodFuWtOqSzeqUaasKNy
KlX4BYSL8rQubLf82kkJwwh1x70dggrQkerUu9nUhbdQ9dlBkOpKMeTKHvudezYK
rl3FW6PwlC40rogETzFAdhvOPV57nDoyS8kZvAOemY1Lc/N7DvwbcXb99ZkWKA0G
ePphCsubGfUDsYBuUj0qliHF5wx2oU71cKUK/eYKRpJ7csJwHmvJ7Cvlpr5NyvPZ
3+1TaXBmq9k74YuLCNf/jE/Q72gYEASWqXNkm55/XICW9dSuvH8+rF9EqvOGqnK4
m5KsDtnOvjGST0DbaMRLWhc0EW73EGcf8jc8REVxk9sXt7+PKQGPt9UX7Krxns9E
dsv8fn3kl0A9SB9wc0+7+mwGeJ6YfZG/8yT9huMpZD54YAr26tKSGT1if00+e89m
0d51O58MT30=
=9GmP
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 65179@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 65179
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch