[bug#65179] [PATCH] gnu: mingw: Update reproducibility patch

[bug#65179] [PATCH] gnu: mingw: Update reproducibility patch

[Michael Ford]

[-- Attachment #1: Type: text/plain, Size: 1815 bytes --]

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(-)

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 #2: Type: text/html, Size: 2349 bytes --]

[bug#65179] [PATCH] gnu: mingw: Update reproducibility patch

[Janneke Nieuwenhuizen]

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

[bug#65179] [PATCH] gnu: mingw: Update reproducibility patch

[Michael Ford]

[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]

> 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:

> 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 #2: Type: text/html, Size: 3105 bytes --]

bug#65179: [PATCH] gnu: mingw: Update reproducibility patch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]


Janneke Nieuwenhuizen <janneke@gnu.org> writes:

> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]