From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uLfDNfda+WAvQgAAgWs5BA (envelope-from ) for ; Thu, 22 Jul 2021 13:48:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EN5xMfda+WDNCwAAbx9fmQ (envelope-from ) for ; Thu, 22 Jul 2021 11:48:07 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7E6E915033 for ; Thu, 22 Jul 2021 13:48:07 +0200 (CEST) Received: from localhost ([::1]:52120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6XBO-00030A-Ey for larch@yhetil.org; Thu, 22 Jul 2021 07:48:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6XBK-0002zz-P1 for guix-patches@gnu.org; Thu, 22 Jul 2021 07:48:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6XBK-0002Yl-HF for guix-patches@gnu.org; Thu, 22 Jul 2021 07:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6XBK-0008SM-An for guix-patches@gnu.org; Thu, 22 Jul 2021 07:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49694] [PATCH core-updates] gnu: binutils: Update binutils patch for mingw. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Jul 2021 11:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49694 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49694@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162695442432425 (code B ref -1); Thu, 22 Jul 2021 11:48:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626954487; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=U8Vrm5JxxZ+jGS4mSHvtryqGAxZF7IUoxlVM+RmXH7c=; b=tWEMRXFw3uc0ot0sSyVHBcsQnmpJ6zBf5JiSQt+EAJ/HA4qjR8hIMfAivbd83y8M/mYtNw Dg6m8lk9tTMyA8sqxiEnQzCcvCHMT8pN+Idz9HyxLcIMkg+oS1QKAAOLqOs5MpYqOMYVdq KKILVop9xYOjYo7oX7AIFBPmlyST5Wy5BiNMZaCkzz87dFGbr9edaPja0GHzdqZOT9zQ3E T3md2MYDorwDu9b689GspDNu+CxeSZZlDO1YZtvcCeiHzGmvroE/Jzsx6GkyzTP1hhsNGP m7iIhvY2MgJrR25cmxahtzYsYznKQ3mKkNS408p8Wz+K/qZD9lUIMC8q5QPI2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626954487; a=rsa-sha256; cv=none; b=lL2qmdi0S2Z8N/xsuEVUN+9hlKJbMCR9WvxpiWGrcU9cvHJqmksyWb72oYHLWRlueQaH39 VyfrofLi9ne9LQzuinIj1WKA7b1fnOkaU4VFC8nuo6uLlVGp4rVO2jRY3gQooBkTkg+Z4T Kjx6DYwb4U8MiFZ4kSXuQZyTc2DElEwxAq2nG0zqneRwGqQXZLkisU0zZP4Rj7Q3EXVx6g ykIKN16PKe46yZN0cnNQNHsvhjJWbfN6ntfskwaegDJifaHgOb/amzWWVDUKnGBOM0ymIw BDFpFBCQVPmp+yGl/IKRrgZ3StGo3ukWyC+3p7CFjbPsyCnRvMBXsflw9pWBRQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=vGEooYiI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=vGEooYiI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7E6E915033 X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: gEnmsHe0lzx5 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