From unknown Sat Jun 14 04:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Apr 2020 19:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40414@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Reply-To: Carl Dong Received: via spool by submit@debbugs.gnu.org id=B.158594048026182 (code B ref -1); Fri, 03 Apr 2020 19:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2020 19:01:20 +0000 Received: from localhost ([127.0.0.1]:43211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKRZ7-0006oB-Uw for submit@debbugs.gnu.org; Fri, 03 Apr 2020 15:01:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:39947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKRZ2-0006nq-As for submit@debbugs.gnu.org; Fri, 03 Apr 2020 15:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42094) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKRZ0-0007YE-Hu for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:12 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKRYt-00055Y-Am for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:09 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:35864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKRYs-00050I-SZ for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:03 -0400 Date: Fri, 03 Apr 2020 19:00:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1585940458; bh=MMrhTTxwuAFxgabfVVlXBC5X/GEGSE3NGTTb+Ual8U4=; h=Date:To:From:Reply-To:Subject:From; b=fmdtv1AlfatkX7RV98AJm2wk2OvCYUGSaYgc/ca7HFW0Qe4k2vUNR9tRfEfBcm5+6 yVDY5UBUBJalgtbSHHBSLgV0JxAiiJf6IA0nvVWOIhqZt+1wUzj6CpuU23Py/x1H6S j5BmWDH0XFYqozOzrUMmBmwYHIPojeHG9+XnkFck= From: Carl Dong Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.70.40.134 X-Spam-Score: 0.3 (/) 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: -0.7 (/) Round 2! Now for some patches applied to mingw-w64 itself, rather than just= binutils. I've checked: - That the mode of the patches are correct - guix build mingw-w64-{x86_64,i686}{,-winpthreads} - guix build hello ----- These patches were originally found at the debian mingw-w64 team's mingw-w64 repo, and should improve the reproducibility of our mingw-w64 toolchain. * gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: New file. * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/mingw.scm (make-mingw-w64): Apply patches. --- gnu/local.mk | 2 ++ gnu/packages/mingw.scm | 4 ++- .../mingw-w64-dlltool-temp-prefix.patch | 26 +++++++++++++++++++ .../mingw-w64-reproducible-gendef.patch | 23 ++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patc= h create mode 100644 gnu/packages/patches/mingw-w64-reproducible-gendef.patc= h diff --git a/gnu/local.mk b/gnu/local.mk index 8328165e17..713d97da86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1201,6 +1201,8 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/metabat-fix-compilation.patch=09=09\ %D%/packages/patches/mhash-keygen-test-segfault.patch=09=09\ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch=09=09\ + %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch=09\ + %D%/packages/patches/mingw-w64-reproducible-gendef.patch=09\ %D%/packages/patches/minisat-friend-declaration.patch=09=09\ %D%/packages/patches/minisat-install.patch=09=09=09\ %D%/packages/patches/mpc123-initialize-ao.patch=09=09\ diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index d0785c5067..37726e5851 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -53,7 +53,9 @@ specified, recurse and return a mingw-w64 with support fo= r winpthreads." "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzx= y85a")) - (patches (search-patches "mingw-w64-6.0.0-gcc.patch")))) + (patches (search-patches "mingw-w64-6.0.0-gcc.patch" + "mingw-w64-dlltool-temp-prefix.pa= tch" + "mingw-w64-reproducible-gendef.pa= tch")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binuti= ls triplet))) ,@(if with-winpthreads? diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu= /packages/patches/mingw-w64-dlltool-temp-prefix.patch new file mode 100644 index 0000000000..432cafc162 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch @@ -0,0 +1,26 @@ +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 + +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=3D$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS) + DTDEF64=3D$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS) + else +- AM_DLLTOOLFLAGS=3D-k --as=3D$(AS) --output-lib $@ ++ AM_DLLTOOLFLAGS=3D-k --as=3D$(AS) --output-lib $@ --temp-prefix $$(base= name $@ .a) + DLLTOOLFLAGSARM32=3D-m arm + DLLTOOLFLAGSARM64=3D-m arm64 + DLLTOOLFLAGS32=3D--as-flags=3D--32 -m i386 diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu= /packages/patches/mingw-w64-reproducible-gendef.patch new file mode 100644 index 0000000000..ee676af7a0 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch @@ -0,0 +1,23 @@ +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/reproducible-gendef.patch + +Description: Drop __DATE__ from gendef +Author: Stephen Kitt + +This allows gendef 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 \n"); + exit (0); + } -- 2.25.1 From unknown Sat Jun 14 04:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 10:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong Cc: 40414@debbugs.gnu.org Received: via spool by 40414-submit@debbugs.gnu.org id=B40414.15859976721961 (code B ref 40414); Sat, 04 Apr 2020 10:55:01 +0000 Received: (at 40414) by debbugs.gnu.org; 4 Apr 2020 10:54:32 +0000 Received: from localhost ([127.0.0.1]:43534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKgRc-0000VY-8X for submit@debbugs.gnu.org; Sat, 04 Apr 2020 06:54:32 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:34786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKgRa-0000V9-Rr for 40414@debbugs.gnu.org; Sat, 04 Apr 2020 06:54:31 -0400 Received: by mail-wm1-f67.google.com with SMTP id c195so4002993wme.1 for <40414@debbugs.gnu.org>; Sat, 04 Apr 2020 03:54:30 -0700 (PDT) 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; bh=GlyljnYEYH30ZHn3mYctEzfTwH4AuinZJzoCpA7U1Ak=; b=ebx4/VK1cDPdJjsk3hREAysk/Cns+jDbzkmcrIXEdG8YcoIlsakxLt8DM39iIxcqbK 2LWWMkHp08ALKhjT9MxBxdRQZSoUdh4tZj4LSb5305WfNKYfRXNwom5zG7igCMOYD+2w /UcbNRPjjB5kGofLVc3Kl1+0RnOWUp37He+IQ1QuJBfsvvDSVXTRD4a4M/GkbdJCvJ64 EteEehtPl8k+h+cQ7jYA4EQR7/f9WayJkcu9u3sb5NYGJTdwTeVXgtRulIe3kT1sMxLa XAkdz5utviusm189BnSVLMJgLd6AR4G74GDgFwlrXeGlhBbFzYJ4A3mKqx396qoHBneb 0+Jw== 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; bh=GlyljnYEYH30ZHn3mYctEzfTwH4AuinZJzoCpA7U1Ak=; b=S3aQZ3EBE+lIgiOiWu7VeYxsmW9RNsTGZn1Z6XhnnDoRVRIelowEoBOvkTh4v4v7A+ Ybjb6L0qfg3I9K+JNjtOT5+MwQV4ibBiJRf7f0H3dCK2/Vxklc9PsLKa5OvTrBXr3lER HpYwinPzyp2bcyqigHvCqm81ReIkzlh1kZLpVgc+9ZNtIadUvgQKLKPydnogQ5/eKqz2 sdbGfgt1U4Gk20YT2NSnMIOnd1dTNAj0DRTtpbxOQRJK8pgReFv6Td5TPzn1PxAHX2PD 5TT2P9vcMyG/Rcfrb7xeBLMnTb0mV/Xo5FgLI0sjemnE3wxbJZxOXtylyjeiFAXRqst/ nZeg== X-Gm-Message-State: AGi0PuavnwHm/F5XfUxC+o7d2j3PnVmKZGg7laXrNARKrUni74OtfgLm 8M2o7/crH2PakG73J4jcDjjlmrYxcWA= X-Google-Smtp-Source: APiQypI41VXuaotO9qDNIYP1cUsZIFldGv7GAGV3BbYKE9xN9byfjTfn8LlPEtt0wJQSXQoNDlWP9A== X-Received: by 2002:a1c:b7c2:: with SMTP id h185mr13420441wmf.67.1585997664880; Sat, 04 Apr 2020 03:54:24 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:881:3172:ad65:9ab]) by smtp.gmail.com with ESMTPSA id c4sm15591831wmb.5.2020.04.04.03.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 03:54:24 -0700 (PDT) From: Mathieu Othacehe References: Date: Sat, 04 Apr 2020 12:54:23 +0200 In-Reply-To: (Carl Dong's message of "Fri, 03 Apr 2020 19:00:49 +0000") Message-ID: <871rp3v7vk.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 Carl, This patch LGTM. Do you know if there are plans to apply those patches mainline? Thanks, Mathieu From unknown Sat Jun 14 04:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 11:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Carl Dong Cc: 40414@debbugs.gnu.org Received: via spool by 40414-submit@debbugs.gnu.org id=B40414.15859980627256 (code B ref 40414); Sat, 04 Apr 2020 11:02:02 +0000 Received: (at 40414) by debbugs.gnu.org; 4 Apr 2020 11:01:02 +0000 Received: from localhost ([127.0.0.1]:43538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKgXu-0001se-0r for submit@debbugs.gnu.org; Sat, 04 Apr 2020 07:01:02 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKgXs-0001la-AZ for 40414@debbugs.gnu.org; Sat, 04 Apr 2020 07:01:00 -0400 Received: by mail-wm1-f66.google.com with SMTP id f20so1529441wmh.3 for <40414@debbugs.gnu.org>; Sat, 04 Apr 2020 04:01:00 -0700 (PDT) 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; bh=kPDM3StWSUG/bbvXvJv0GbRMTsqwzsWbseLjCGZj3rw=; b=aYrefMUfapRXT3A/Ovp73hQRyHlbAPa0zUqQjWDkbr6T0v6pfpabNw8drnWZ2e/Is7 pnVvbMTj75pdz+MC9lebL6B/VWtej+xA/0Ye9amxi4QgYjuvEQVbRIA6OrnAjgRIVpym Z7msPoqDRGXNB5cntwZ3qeWssIWX54qiHIq3J8R+wByk0FJ0YoEV2vlVmkCtNpZ3aUn2 lL7ix6+TpgO58Jf5brdTdOTM9y1XPrhxY/+qP0HoY7AWexsw/HATPOqF/OHZsjeAwfA+ ntUiJIXrtid/a4YvdYAZ61eeA9ldDPnXmpE8gTUdZhGe4KoYZYFcu9O61PLYF6BPySIL WxPg== 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; bh=kPDM3StWSUG/bbvXvJv0GbRMTsqwzsWbseLjCGZj3rw=; b=QpU/f8iL3b25jmMoZYHxkcUQg2HpWwra/KYL91gOjTTYavZwx15HJeQ7OfLDsf/4w+ NGPg7rK0qUp7JOoYz/1xxNIzOqkl+WupTKEs+eYrp4DqMHbx1QzZD0gIKXB1Np7JvfT8 bUMl0YmrUQu0gDleJ1tz0uFzrWnLxmbJGW9r0UWMdtkb/XSM7KD20TDdpcp/D+6jAUF2 t+7dwzdvYFIRvdK2HJu9RuKihyW2/oAb+hHGVHG9VVFfDwoODGYAmBZ9svTdxYlMr0Lh q5ovBlyc0KJaWcSNOy3VSXhTl4+v9A0Qkr7n/+0IFjz8B/Myz/J+vJ0bn1HEVMBG/dSR rlLg== X-Gm-Message-State: AGi0PuY7Cpi/2lzy72cDLzpkPKJkl7fEJKoWQkH0CgFJpVk2ByGlOQDQ OIitX1+Y4mWG2W0ieqouK0T/IB9Du0k= X-Google-Smtp-Source: APiQypLmhvFwFVUn9gJ8t5own+LFJeLYr5qLk/z5+YMZE9cyR3bi+dFvaQkzE20djKEYPc0aA0JT0g== X-Received: by 2002:a05:600c:234f:: with SMTP id 15mr13430515wmq.107.1585998054244; Sat, 04 Apr 2020 04:00:54 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:881:3172:ad65:9ab]) by smtp.gmail.com with ESMTPSA id u5sm17844745wrp.81.2020.04.04.04.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 04:00:53 -0700 (PDT) From: Mathieu Othacehe References: Date: Sat, 04 Apr 2020 13:00:53 +0200 In-Reply-To: (Carl Dong's message of "Fri, 03 Apr 2020 19:00:49 +0000") Message-ID: <87wo6vtt0a.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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 (-) > + (patches (search-patches "mingw-w64-6.0.0-gcc.patch" > + "mingw-w64-dlltool-temp-prefix.patch" > + "mingw-w64-reproducible-gendef.patch")))) Also you can add a break after "patches" so that you respect the 78 columns limit, this way: --8<---------------cut here---------------start------------->8--- (patches (search-patches "mingw-w64-6.0.0-gcc.patch" "mingw-w64-dlltool-temp-prefix.patch" "mingw-w64-reproducible-gendef.patch")))) --8<---------------cut here---------------end--------------->8--- Thanks, Mathieu From unknown Sat Jun 14 04:55:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. Resent-From: Carl Dong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Apr 2020 19:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40414 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 40414@debbugs.gnu.org Reply-To: Carl Dong Received: via spool by 40414-submit@debbugs.gnu.org id=B40414.158602961615892 (code B ref 40414); Sat, 04 Apr 2020 19:47:02 +0000 Received: (at 40414) by debbugs.gnu.org; 4 Apr 2020 19:46:56 +0000 Received: from localhost ([127.0.0.1]:44847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKokq-00048F-KL for submit@debbugs.gnu.org; Sat, 04 Apr 2020 15:46:56 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:15469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKokp-00047l-9O for 40414@debbugs.gnu.org; Sat, 04 Apr 2020 15:46:56 -0400 Date: Sat, 04 Apr 2020 19:46:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1586029608; bh=tZynwXDa3EGKFXjcDV99XmC4FQVqUa+CsSiU8u0Lw64=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=DKO+6ycyI6cpFj8K+RsTS/p3nELAe1c1N9gxmYlheG+nJ9GJGLldsDmWrsnSB2VqW 3bkxa7uyKfaEi12Us1AN0Ouaa0dbS/rp1SBjvKKrnKEt/qq5+fANheo85ZhHFUw5Qi bZX5A8OglNlGGYZcFckyBoJgS9C5IRABCSJ1XoP4= From: Carl Dong Message-ID: In-Reply-To: <871rp3v7vk.fsf@gmail.com> References: <871rp3v7vk.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch X-Spam-Score: -0.7 (/) 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.7 (-) Great to hear Mathieu, I will push my changes along with the line break sug= gestion. Not sure about plans to apply patches mainline=E2=80=A6 I will reach out to= the original author to ask about this. Cheers, Carl Dong > On Apr 4, 2020, at 6:54 AM, Mathieu Othacehe wrote= : >=20 >=20 >=20 > Hello Carl, >=20 > This patch LGTM. Do you know if there are plans to apply those patches > mainline? >=20 > Thanks, >=20 > Mathieu From unknown Sat Jun 14 04:55:24 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Carl Dong Subject: bug#40414: closed (Re: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches.) Message-ID: References: <87k12us2mb.fsf@gmail.com> X-Gnu-PR-Message: they-closed 40414 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 40414@debbugs.gnu.org Date: Sun, 05 Apr 2020 09:29:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1586078942-22206-1" This is a multi-part message in MIME format... ------------=_1586078942-22206-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #40414: [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 40414@debbugs.gnu.org. --=20 40414: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40414 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1586078942-22206-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 40414-done) by debbugs.gnu.org; 5 Apr 2020 09:28:36 +0000 Received: from localhost ([127.0.0.1]:45193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jL1a0-0005ki-Iv for submit@debbugs.gnu.org; Sun, 05 Apr 2020 05:28:36 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:40551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jL1Zz-0005kF-IT for 40414-done@debbugs.gnu.org; Sun, 05 Apr 2020 05:28:35 -0400 Received: by mail-wm1-f44.google.com with SMTP id a81so12488423wmf.5 for <40414-done@debbugs.gnu.org>; Sun, 05 Apr 2020 02:28:35 -0700 (PDT) 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=55BFEr3yfxGk8KClFIExuVRMy4KlZuba04RPuDnS6zM=; b=J21bJjMPBVtGt6AjmZsv1ypg7qCgOU+qy2un/qcLhGDSKGKUuTq1D+n+DkT4sbwrLP hFH8+YSXc1bMeSPLSH2FiJkzHl1xs9T4wz8TeSNZse+ftL6cUc9X7GrSWTIkxiTaZWV6 Td1GKwnqhlo+zxRQTzb5kMtYZX42Hf0xiQYeYpWAF47II4lPDBHurzs2RdrIi8dDek87 Fgo0Fp9f2BY698KWZ1XLYa4WugSlC0bELRGljZwvD+/VG3YJWOWbGrMD9mjdKsMu01pQ n0qe0oxU56X8Q23/ZbSGUUdFEEfUqopqCTQAKBesy1QkvbtBarcA4DRjKUCFhBkynM9g qfSg== 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=55BFEr3yfxGk8KClFIExuVRMy4KlZuba04RPuDnS6zM=; b=K8pjqGjlH2yca4qncPZQ8QL9KJBy8FwTjHNFaSo6ARlRKCyWHoDd6OcwGnYtbSHiI4 qTZrE+qks3w0x+owDRzlQYosBIrYnr7DEt9/stY7F1N31UXisRKp0KMQKFxmBTiPG8C/ ZnlL8TO7UvHL8JMsGUjXBrJEY3jKUiQhh9fkpIKE7TzIhku+7t2dnirTQWw3sA+Y2qsS /5LhCiN5+NKNVp0fJM7GzIbthg4JsJUW02WzfF1gkH3wZoE/zxLuU747zTYMJuYQFjuM fW/xvrfeqgYZFvHar688nqWOBlkMEp4/tONUVIgDpdklHZkHCc9bl02sL52nERH2EKEH nUzQ== X-Gm-Message-State: AGi0PuZTrscu32bcuUJHJuQewbf6Yhof6kY0fHE3XwIV63ZwrZflJA/i O+KrX5Sq5NNdh17BvjAK23TsY4TZWKM= X-Google-Smtp-Source: APiQypJVBLNaSsBOV7mmag+tgcZwuHWZRY2eJ+vpN/aQVOf24rDcjnivCBtu1sKRN+jUo18GgjAB7A== X-Received: by 2002:a1c:f205:: with SMTP id s5mr16943346wmc.101.1586078909586; Sun, 05 Apr 2020 02:28:29 -0700 (PDT) Received: from meru ([2a01:cb18:832e:5f00:4928:41d8:3661:4718]) by smtp.gmail.com with ESMTPSA id h81sm20856669wme.42.2020.04.05.02.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 02:28:29 -0700 (PDT) From: Mathieu Othacehe To: Carl Dong Subject: Re: [bug#40414] [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. References: <871rp3v7vk.fsf@gmail.com> Date: Sun, 05 Apr 2020 11:28:28 +0200 In-Reply-To: (Carl Dong's message of "Sat, 04 Apr 2020 19:46:44 +0000") Message-ID: <87k12us2mb.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (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: 40414-done Cc: 40414-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 (-) Hey, > Not sure about plans to apply patches mainline=E2=80=A6 I will reach out = to the original author to ask about this. Great, don't forget to close the ticket once pushed :) Thanks, Mathieu ------------=_1586078942-22206-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 3 Apr 2020 19:01:20 +0000 Received: from localhost ([127.0.0.1]:43211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKRZ7-0006oB-Uw for submit@debbugs.gnu.org; Fri, 03 Apr 2020 15:01:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:39947) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKRZ2-0006nq-As for submit@debbugs.gnu.org; Fri, 03 Apr 2020 15:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42094) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKRZ0-0007YE-Hu for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:12 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKRYt-00055Y-Am for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:09 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:35864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKRYs-00050I-SZ for guix-patches@gnu.org; Fri, 03 Apr 2020 15:01:03 -0400 Date: Fri, 03 Apr 2020 19:00:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=carldong.me; s=protonmail; t=1585940458; bh=MMrhTTxwuAFxgabfVVlXBC5X/GEGSE3NGTTb+Ual8U4=; h=Date:To:From:Reply-To:Subject:From; b=fmdtv1AlfatkX7RV98AJm2wk2OvCYUGSaYgc/ca7HFW0Qe4k2vUNR9tRfEfBcm5+6 yVDY5UBUBJalgtbSHHBSLgV0JxAiiJf6IA0nvVWOIhqZt+1wUzj6CpuU23Py/x1H6S j5BmWDH0XFYqozOzrUMmBmwYHIPojeHG9+XnkFck= To: "guix-patches@gnu.org" From: Carl Dong Subject: [PATCH] gnu: mingw: Add mingw-w64 reproducibility patches. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.70.40.134 X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit 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: , Reply-To: Carl Dong Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Round 2! Now for some patches applied to mingw-w64 itself, rather than just= binutils. I've checked: - That the mode of the patches are correct - guix build mingw-w64-{x86_64,i686}{,-winpthreads} - guix build hello ----- These patches were originally found at the debian mingw-w64 team's mingw-w64 repo, and should improve the reproducibility of our mingw-w64 toolchain. * gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch: New file. * gnu/packages/patches/mingw-w64-reproducible-gendef.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/mingw.scm (make-mingw-w64): Apply patches. --- gnu/local.mk | 2 ++ gnu/packages/mingw.scm | 4 ++- .../mingw-w64-dlltool-temp-prefix.patch | 26 +++++++++++++++++++ .../mingw-w64-reproducible-gendef.patch | 23 ++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patc= h create mode 100644 gnu/packages/patches/mingw-w64-reproducible-gendef.patc= h diff --git a/gnu/local.mk b/gnu/local.mk index 8328165e17..713d97da86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1201,6 +1201,8 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/metabat-fix-compilation.patch=09=09\ %D%/packages/patches/mhash-keygen-test-segfault.patch=09=09\ %D%/packages/patches/mingw-w64-6.0.0-gcc.patch=09=09\ + %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch=09\ + %D%/packages/patches/mingw-w64-reproducible-gendef.patch=09\ %D%/packages/patches/minisat-friend-declaration.patch=09=09\ %D%/packages/patches/minisat-install.patch=09=09=09\ %D%/packages/patches/mpc123-initialize-ao.patch=09=09\ diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index d0785c5067..37726e5851 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -53,7 +53,9 @@ specified, recurse and return a mingw-w64 with support fo= r winpthreads." "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 (base32 "0a5njsa2zw2ssdz10jkb10mhrf3cb8qp9avs89zqmw4n6pzx= y85a")) - (patches (search-patches "mingw-w64-6.0.0-gcc.patch")))) + (patches (search-patches "mingw-w64-6.0.0-gcc.patch" + "mingw-w64-dlltool-temp-prefix.pa= tch" + "mingw-w64-reproducible-gendef.pa= tch")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binuti= ls triplet))) ,@(if with-winpthreads? diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu= /packages/patches/mingw-w64-dlltool-temp-prefix.patch new file mode 100644 index 0000000000..432cafc162 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch @@ -0,0 +1,26 @@ +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 + +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=3D$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS) + DTDEF64=3D$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS) + else +- AM_DLLTOOLFLAGS=3D-k --as=3D$(AS) --output-lib $@ ++ AM_DLLTOOLFLAGS=3D-k --as=3D$(AS) --output-lib $@ --temp-prefix $$(base= name $@ .a) + DLLTOOLFLAGSARM32=3D-m arm + DLLTOOLFLAGSARM64=3D-m arm64 + DLLTOOLFLAGS32=3D--as-flags=3D--32 -m i386 diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu= /packages/patches/mingw-w64-reproducible-gendef.patch new file mode 100644 index 0000000000..ee676af7a0 --- /dev/null +++ b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch @@ -0,0 +1,23 @@ +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/reproducible-gendef.patch + +Description: Drop __DATE__ from gendef +Author: Stephen Kitt + +This allows gendef 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 \n"); + exit (0); + } -- 2.25.1 ------------=_1586078942-22206-1--