[arch-commits] Commit in mingw-w64-binutils/trunk (2 files)

[Felix Yan]

    Date: Sunday, June 5, 2022 @ 13:39:41
  Author: felixonmars
Revision: 1222864

upgpkg: mingw-w64-binutils 2.38-3: add a patch to fix build issues for wine

Added:
  mingw-w64-binutils/trunk/99852365513266afdd793289813e8e565186c9e6.patch
Modified:
  mingw-w64-binutils/trunk/PKGBUILD

------------------------------------------------+
 99852365513266afdd793289813e8e565186c9e6.patch |   36 +++++++++++++++++++++++
 PKGBUILD                                       |    9 +++--
 2 files changed, 42 insertions(+), 3 deletions(-)

Added: 99852365513266afdd793289813e8e565186c9e6.patch
===================================================================
--- 99852365513266afdd793289813e8e565186c9e6.patch	                        (rev 0)
+++ 99852365513266afdd793289813e8e565186c9e6.patch	2022-06-05 13:39:41 UTC (rev 1222864)
@@ -0,0 +1,36 @@
+From 99852365513266afdd793289813e8e565186c9e6 Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc at redhat.com>
+Date: Wed, 23 Mar 2022 11:39:49 +0000
+Subject: [PATCH] dlltool: Use the output name as basis for deterministic temp
+ prefixes
+
+	PR 28885
+	* dlltool.c (main): use imp_name rather than dll_name when
+	generating a temporary file name.
+---
+ binutils/ChangeLog | 9 +++++++++
+ binutils/dlltool.c | 7 ++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/binutils/dlltool.c b/binutils/dlltool.c
+index d95bf3f5470..89871510b45 100644
+--- a/binutils/dlltool.c
++++ b/binutils/dlltool.c
+@@ -3992,10 +3992,11 @@ main (int ac, char **av)
+   if (tmp_prefix == NULL)
+     {
+       /* If possible use a deterministic prefix.  */
+-      if (dll_name)
++      if (imp_name || delayimp_name)
+         {
+-          tmp_prefix = xmalloc (strlen (dll_name) + 2);
+-          sprintf (tmp_prefix, "%s_", dll_name);
++          const char *input = imp_name ? imp_name : delayimp_name;
++          tmp_prefix = xmalloc (strlen (input) + 2);
++          sprintf (tmp_prefix, "%s_", input);
+           for (i = 0; tmp_prefix[i]; i++)
+             if (!ISALNUM (tmp_prefix[i]))
+               tmp_prefix[i] = '_';
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-05 13:16:31 UTC (rev 1222863)
+++ PKGBUILD	2022-06-05 13:39:41 UTC (rev 1222864)
@@ -2,7 +2,7 @@
 
 pkgname=mingw-w64-binutils
 pkgver=2.38
-pkgrel=2
+pkgrel=3
 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
 arch=('x86_64')
 url="http://www.gnu.org/software/binutils"
@@ -11,14 +11,17 @@
 depends=('zlib')
 options=('!libtool' '!emptydirs')
 validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')  # Nick Clifton (Chief Binutils Maintainer) <nickc at redhat.com>
-source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig})
+source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig}
+        99852365513266afdd793289813e8e565186c9e6.patch)
 sha512sums=('5160ff5c2a0ad41b880384216e21ada5328b51378e760c04269eb3b3626400d12abeeea72c14e18b52b969a0be94c8e5285c0b568bd5c82b7e69f68e0dfdc743'
-            'SKIP')
+            'SKIP'
+            'cdce2ac2666fe27973152748a0108475bd1c0bbfa1559116d42c6badcdb0a60258b2a01180e0b37a65bef8df520a795d105eb80d88ce1846d006b5ea818b2c60')
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "$srcdir"/binutils-${pkgver}
+  patch -p1 -i ../99852365513266afdd793289813e8e565186c9e6.patch
   #do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 }