From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 22 07:47:04 2021 Received: (at submit) by debbugs.gnu.org; 22 Jul 2021 11:47:04 +0000 Received: from localhost ([127.0.0.1]:39490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6XAO-0008Qv-Aq for submit@debbugs.gnu.org; Thu, 22 Jul 2021 07:47:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:39622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6XAL-0008Qa-N1 for submit@debbugs.gnu.org; Thu, 22 Jul 2021 07:47:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6XAL-0002rT-9s for guix-patches@gnu.org; Thu, 22 Jul 2021 07:47:01 -0400 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]:33322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6XAI-0001ib-IB for guix-patches@gnu.org; Thu, 22 Jul 2021 07:47:01 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id YBmv250010mfAB406Bmvdp; Thu, 22 Jul 2021 13:46:55 +0200 From: Maxime Devos To: guix-patches@gnu.org Subject: [PATCH core-updates] gnu: binutils: Update binutils patch for mingw. Date: Thu, 22 Jul 2021 13:46:44 +0200 Message-Id: <20210722114644.27688-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1626954415; bh=U8Vrm5JxxZ+jGS4mSHvtryqGAxZF7IUoxlVM+RmXH7c=; h=From:To:Cc:Subject:Date; b=vGEooYiIfpSPVMsEsNMpnbSI7/48rm7Lzk1UEsumAEISezyHoEqv5HLT4wz6cS8+T oqnOKa1LIJgS5TTG/Nv0Hbksnj5U44v8QECDy3E1W0wXEPVTLJtYX6P+F3Vrmk4/8X 75QtH8V+6HCmgRrK/sr2pZ0aET5rsfHZkfyHyMNp6BZRAC1cPFB0shj0veAnE+iC3J WFu6PY8AZH1yZkSlrcX6yWgJdNVtOsQ8LEzOMUeDusdhOIJxR9lKn8r1OGkYzBw3N+ MQfc7moOsoU7pr4CcUu5gVcePiNgS5kOMDu5BvWPZSbHzRcWBXEO34ePFunXEHg82C kuhvuAkLgGypg== Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: Maxime Devos 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 (--) This allows "./pre-inst-env guix build hello --target=x86_64-w64-mingw32" to succeed. The binary can be run successfully under wine. * gnu/packages/patches/binutils-mingw-w64-timestamp.patch: Update to the current version in Debian. --- .../binutils-mingw-w64-timestamp.patch | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/gnu/packages/patches/binutils-mingw-w64-timestamp.patch b/gnu/packages/patches/binutils-mingw-w64-timestamp.patch index b785043b62..fb775e8b95 100644 --- a/gnu/packages/patches/binutils-mingw-w64-timestamp.patch +++ b/gnu/packages/patches/binutils-mingw-w64-timestamp.patch @@ -4,14 +4,14 @@ https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64.git Invoke the following in the aforementioned repo to see the original patch: - $ git show da63f6b:debian/patches/specify-timestamp.patch + $ git show faf7c64:debian/patches/specify-timestamp.patch Description: Allow the PE timestamp to be specified Author: Stephen Kitt --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c -@@ -70,6 +70,9 @@ +@@ -77,6 +77,9 @@ #include #endif @@ -21,20 +21,20 @@ Author: Stephen Kitt /* NOTE: it's strange to be including an architecture specific header in what's supposed to be general (to PE/PEI) code. However, that's where the definitions are, and they don't vary per architecture -@@ -879,10 +882,38 @@ +@@ -876,9 +879,36 @@ /* Use a real timestamp by default, unless the no-insert-timestamp option was chosen. */ -- if ((pe_data (abfd)->insert_timestamp)) +- if ((pe_data (abfd)->timestamp) == -1) - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); - else -+ if (pe_data (abfd)->insert_timestamp) { ++ if ((pe_data (abfd)->timestamp) == -1) { + time_t now; + char *source_date_epoch; + unsigned long long epoch; + char *endptr; + -+ now = time(NULL); ++ now = time (NULL); + source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + if (source_date_epoch) { + errno = 0; @@ -57,30 +57,29 @@ Author: Stephen Kitt + } + } + H_PUT_32 (abfd, now, filehdr_out->f_timdat); -+ } else { - H_PUT_32 (abfd, 0, filehdr_out->f_timdat); -+ } ++ } else + H_PUT_32 (abfd, pe_data (abfd)->timestamp, filehdr_out->f_timdat); PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -26,6 +26,8 @@ - #include "filenames.h" +@@ -27,6 +27,8 @@ #include "safe-ctype.h" + #include "ctf-api.h" +#include +#include #include #include "ld.h" -@@ -1202,8 +1204,36 @@ +@@ -1218,9 +1220,36 @@ memset (edata_d, 0, edata_sz); -- if (pe_data (abfd)->insert_timestamp) +- if (pe_data (abfd)->timestamp == -1) - H_PUT_32 (abfd, time (0), edata_d + 4); -+ if (pe_data (abfd)->insert_timestamp) { +- else ++ if (pe_data (abfd)->timestamp == -1) { + time_t now; + char *source_date_epoch; + unsigned long long epoch; @@ -109,13 +108,13 @@ Author: Stephen Kitt + } + } + H_PUT_32 (abfd, now, edata_d + 4); -+ } ++ } else + H_PUT_32 (abfd, pe_data (abfd)->timestamp, edata_d + 4); if (pe_def_file->version_major != -1) - { --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -303,7 +303,7 @@ +@@ -304,7 +304,7 @@ OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, @@ -134,4 +133,4 @@ Author: Stephen Kitt + {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, - {NULL, no_argument, NULL, 0} + {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 23 08:41:00 2021 Received: (at 49694-done) by debbugs.gnu.org; 23 Jul 2021 12:41:00 +0000 Received: from localhost ([127.0.0.1]:42515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6uU8-0001UQ-Fw for submit@debbugs.gnu.org; Fri, 23 Jul 2021 08:41:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6uU6-0001U9-QM for 49694-done@debbugs.gnu.org; Fri, 23 Jul 2021 08:40:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:53086) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6uU0-0004cD-AB; Fri, 23 Jul 2021 08:40:52 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=35030 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6uTl-0003gn-TY; Fri, 23 Jul 2021 08:40:43 -0400 From: Mathieu Othacehe To: Maxime Devos Subject: Re: [bug#49694] [PATCH core-updates] gnu: binutils: Update binutils patch for mingw. References: <20210722114644.27688-1-maximedevos@telenet.be> Date: Fri, 23 Jul 2021 14:40:36 +0200 In-Reply-To: <20210722114644.27688-1-maximedevos@telenet.be> (Maxime Devos's message of "Thu, 22 Jul 2021 13:46:44 +0200") Message-ID: <87wnphciez.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49694-done Cc: 49694-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: -3.3 (---) Hello Maxime, > + char *source_date_epoch; > + unsigned long long epoch; > @@ -109,13 +108,13 @@ Author: Stephen Kitt > + } There's something odd with this patch, I had troubles to apply it. Anyway, it seems to work fine, pushed as 3f7efaa54accd39d2b8d75014634a3daa9d2fac9. Thanks, Mathieu From unknown Sat Jun 14 14:29:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 21 Aug 2021 11:24:08 +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