me
/
guix
Archived
1
0
Fork 0
Code

gnu: binutils: Update binutils patch for mingw. 

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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
master
Maxime Devos 2021-07-22 13:46:44 +02:00 committed by Mathieu Othacehe
parent d7942ac12a
commit 3f7efaa54a
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/patches/binutils-mingw-w64-timestamp.patch
View File

@ -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: 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 Description: Allow the PE timestamp to be specified
Author: Stephen Kitt <skitt@debian.org> Author: Stephen Kitt <skitt@debian.org>
--- a/bfd/peXXigen.c --- a/bfd/peXXigen.c
+++ b/bfd/peXXigen.c +++ b/bfd/peXXigen.c
@@ -70,6 +70,9 @@ @@ -77,6 +77,9 @@
#include <wctype.h> #include <wctype.h>
#endif #endif
@ -21,20 +21,20 @@ Author: Stephen Kitt <skitt@debian.org>
/* NOTE: it's strange to be including an architecture specific header /* 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 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 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 /* Use a real timestamp by default, unless the no-insert-timestamp
option was chosen. */ 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); - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
- else - else
+ if (pe_data (abfd)->insert_timestamp) { + if ((pe_data (abfd)->timestamp) == -1) {
+ time_t now; + time_t now;
+ char *source_date_epoch; + char *source_date_epoch;
+ unsigned long long epoch; + unsigned long long epoch;
+ char *endptr; + char *endptr;
+ +
+ now = time(NULL); + now = time (NULL);
+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+ if (source_date_epoch) { + if (source_date_epoch) {
+ errno = 0; + errno = 0;
@ -57,30 +57,29 @@ Author: Stephen Kitt <skitt@debian.org>
+ } + }
+ } + }
+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); + H_PUT_32 (abfd, now, filehdr_out->f_timdat);
+ } else { + } else
H_PUT_32 (abfd, 0, filehdr_out->f_timdat); H_PUT_32 (abfd, pe_data (abfd)->timestamp, filehdr_out->f_timdat);
+ }
PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
filehdr_out->f_symptr);
--- a/ld/pe-dll.c --- a/ld/pe-dll.c
+++ b/ld/pe-dll.c +++ b/ld/pe-dll.c
@@ -26,6 +26,8 @@ @@ -27,6 +27,8 @@
#include "filenames.h"
#include "safe-ctype.h" #include "safe-ctype.h"
#include "ctf-api.h"
+#include <errno.h> +#include <errno.h>
+#include <limits.h> +#include <limits.h>
#include <time.h> #include <time.h>
#include "ld.h" #include "ld.h"
@@ -1202,8 +1204,36 @@ @@ -1218,9 +1220,36 @@
memset (edata_d, 0, edata_sz); 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); - 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; + time_t now;
+ char *source_date_epoch; + char *source_date_epoch;
+ unsigned long long epoch; + unsigned long long epoch;
@ -109,13 +108,13 @@ Author: Stephen Kitt <skitt@debian.org>
+ } + }
+ } + }
+ H_PUT_32 (abfd, now, edata_d + 4); + 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) if (pe_def_file->version_major != -1)
{
--- a/ld/emultempl/pe.em --- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em
@@ -303,7 +303,7 @@ @@ -304,7 +304,7 @@
OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, OPTION_USE_NUL_PREFIXED_IMPORT_TABLES},
{"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE},
{"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE},
@ -126,7 +125,7 @@ Author: Stephen Kitt <skitt@debian.org>
/* getopt allows abbreviations, so we do this to stop it /* getopt allows abbreviations, so we do this to stop it
--- a/ld/emultempl/pep.em --- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em
@@ -321,7 +321,7 @@ @@ -323,7 +323,7 @@
{"no-bind", no_argument, NULL, OPTION_NO_BIND}, {"no-bind", no_argument, NULL, OPTION_NO_BIND},
{"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
{"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
@ -134,4 +133,4 @@ Author: Stephen Kitt <skitt@debian.org>
+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP},
{"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
{"build-id", optional_argument, NULL, OPTION_BUILD_ID}, {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
{NULL, no_argument, NULL, 0} {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION},