[arch-commits] Commit in gcc-multilib/trunk (PKGBUILD Unlink-the-response-file.patch)

[Jan Steffens]

    Date: Thursday, February 11, 2016 @ 12:50:24
  Author: heftig
Revision: 161192

5.3.0-4

Added:
  gcc-multilib/trunk/Unlink-the-response-file.patch
Modified:
  gcc-multilib/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   19 ++++++++-----
 Unlink-the-response-file.patch |   54 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-11 11:50:00 UTC (rev 161191)
+++ PKGBUILD	2016-02-11 11:50:24 UTC (rev 161192)
@@ -9,8 +9,8 @@
 pkgver=5.3.0
 _pkgver=5
 _islver=0.15
-pkgrel=3
-#_snapshot=5-20150623
+pkgrel=4
+_snapshot=5-20160209
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -19,11 +19,13 @@
              'lib32-glibc>=2.22')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
-md5sums=('c9616fd448f980259c31de613e575719'
-         '8428efbbc6f6e2810ce5c1ba73ecf98c')
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
+        Unlink-the-response-file.patch)
+md5sums=('499161c65b639aa5c12a14944582b7ec'
+         '8428efbbc6f6e2810ce5c1ba73ecf98c'
+         '1f4d4ef71004261376d26d5ba6a84499')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -50,6 +52,9 @@
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
+  # https://bugs.archlinux.org/task/47874 - commit f591a95d
+  patch -p1 -i $srcdir/Unlink-the-response-file.patch
+
   mkdir ${srcdir}/gcc-build
 }
 

Added: Unlink-the-response-file.patch
===================================================================
--- Unlink-the-response-file.patch	                        (rev 0)
+++ Unlink-the-response-file.patch	2016-02-11 11:50:24 UTC (rev 161192)
@@ -0,0 +1,54 @@
+From f591a95d1532ac7791c146a8e55ba3a32b3e476f Mon Sep 17 00:00:00 2001
+From: ebotcazou <ebotcazou at 138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 23 Jun 2015 20:48:07 +0000
+Subject: [PATCH] 	* collect-utils.c (collect_wait): Unlink the
+ response file here 	instead of... 	(do_wait): ...here. 
+ (utils_cleanup): ...and here.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224858 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog       |  7 +++++++
+ gcc/collect-utils.c | 14 ++++++--------
+ 2 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/gcc/collect-utils.c b/gcc/collect-utils.c
+index 6bbe9eb..517a075 100644
+--- a/gcc/collect-utils.c
++++ b/gcc/collect-utils.c
+@@ -68,6 +68,12 @@ collect_wait (const char *prog, struct pex_obj *pex)
+     fatal_error (input_location, "can't get program status: %m");
+   pex_free (pex);
+ 
++  if (response_file && !save_temps)
++    {
++      unlink (response_file);
++      response_file = NULL;
++    }
++
+   if (status)
+     {
+       if (WIFSIGNALED (status))
+@@ -90,12 +96,6 @@ do_wait (const char *prog, struct pex_obj *pex)
+   int ret = collect_wait (prog, pex);
+   if (ret != 0)
+     fatal_error (input_location, "%s returned %d exit status", prog, ret);
+-
+-  if (response_file && !save_temps)
+-    {
+-      unlink (response_file);
+-      response_file = NULL;
+-    }
+ }
+ 
+ 

+@@ -224,7 +224,5 @@ utils_cleanup (bool from_signal)
+      calls to maybe_unlink fails. */
+   cleanup_done = true;
+ 
+-  if (response_file)
+-    maybe_unlink (response_file);
+   tool_cleanup (from_signal);
+ }
+-- 
+2.7.1
+