summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO48
-rw-r--r--PKGBUILD21
-rw-r--r--Unlink-the-response-file.patch54
3 files changed, 92 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af8660de0cd6..53e81c145b7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Dec 24 11:19:49 UTC 2015
+# Mon Feb 15 10:54:34 UTC 2016
pkgbase = gcc-multilib-x32
pkgdesc = The GNU Compiler Collection for multilib with x32 ABI support
pkgver = 5.3.0
- pkgrel = 3.1
+ pkgrel = 4.1
url = http://gcc.gnu.org
arch = x86_64
license = GPL
@@ -19,20 +19,22 @@ pkgbase = gcc-multilib-x32
makedepends = lib32-glibc>=2.22
makedepends = libx32-glibc>=2.22
options = !emptydirs
- source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.3.0/gcc-5.3.0.tar.bz2
+ source = ftp://gcc.gnu.org/pub/gcc/snapshots/5-20160209/gcc-5-20160209.tar.bz2
source = http://isl.gforge.inria.fr/isl-0.15.tar.bz2
- md5sums = c9616fd448f980259c31de613e575719
+ source = Unlink-the-response-file.patch
+ md5sums = 499161c65b639aa5c12a14944582b7ec
md5sums = 8428efbbc6f6e2810ce5c1ba73ecf98c
+ md5sums = 1f4d4ef71004261376d26d5ba6a84499
pkgname = gcc-multilib-x32
pkgdesc = The GNU Compiler Collection - C and C++ frontends for multilib with x32 ABI support
install = gcc.install
groups = x32-devel
- depends = gcc-libs-multilib-x32=5.3.0-3.1
+ depends = gcc-libs-multilib-x32=5.3.0-4.1
depends = binutils>=2.25
depends = libmpc
- provides = gcc=5.3.0-3
- provides = gcc-multilib=5.3.0-3
+ provides = gcc=5.3.0-4
+ provides = gcc-multilib=5.3.0-4
conflicts = gcc
conflicts = gcc-x32-seed
conflicts = gcc-multilib
@@ -42,10 +44,10 @@ pkgname = gcc-libs-multilib-x32
pkgdesc = Runtime libraries shipped by GCC for multilib with x32 ABI support
install = gcc-libs.install
depends = glibc>=2.22
- depends = lib32-gcc-libs=5.3.0-3
- depends = libx32-gcc-libs=5.3.0-3.1
- provides = gcc-libs=5.3.0-3
- provides = gcc-libs-multilib=5.3.0-3
+ depends = lib32-gcc-libs=5.3.0-4
+ depends = libx32-gcc-libs=5.3.0-4.1
+ provides = gcc-libs=5.3.0-4
+ provides = gcc-libs-multilib=5.3.0-4
conflicts = gcc-libs
options = !emptydirs
options = !strip
@@ -59,25 +61,25 @@ pkgname = libx32-gcc-libs
pkgname = gcc-fortran-multilib-x32
pkgdesc = Fortran front-end for GCC for multilib with x32 ABI support
install = gcc-fortran.install
- depends = gcc-multilib-x32=5.3.0-3.1
- provides = gcc-fortran=5.3.0-3
- provides = gcc-fortran-multilib=5.3.0-3
+ depends = gcc-multilib-x32=5.3.0-4.1
+ provides = gcc-fortran=5.3.0-4
+ provides = gcc-fortran-multilib=5.3.0-4
conflicts = gcc-fortran
options = !emptydirs
pkgname = gcc-objc-multilib-x32
pkgdesc = Objective-C front-end for GCC for multilib with x32 ABI support
- depends = gcc-multilib-x32=5.3.0-3.1
- provides = gcc-objc=5.3.0-3
- provides = gcc-objc-multilib=5.3.0-3
+ depends = gcc-multilib-x32=5.3.0-4.1
+ provides = gcc-objc=5.3.0-4
+ provides = gcc-objc-multilib=5.3.0-4
conflicts = gcc-objc
pkgname = gcc-ada-multilib-x32
pkgdesc = Ada front-end for GCC (GNAT) for multilib with x32 ABI support
install = gcc-ada.install
- depends = gcc-multilib-x32=5.3.0-3.1
- provides = gcc-ada=5.3.0-3
- provides = gcc-ada-multilib=5.3.0-3
+ depends = gcc-multilib-x32=5.3.0-4.1
+ provides = gcc-ada=5.3.0-4
+ provides = gcc-ada-multilib=5.3.0-4
conflicts = gcc-ada
options = staticlibs
options = !emptydirs
@@ -85,9 +87,9 @@ pkgname = gcc-ada-multilib-x32
pkgname = gcc-go-multilib-x32
pkgdesc = Go front-end for GCC for multilib with x32 ABI support
install = gcc-go.install
- depends = gcc-multilib-x32=5.3.0-3.1
- provides = gcc-go=5.3.0-3
- provides = gcc-go-multilib=5.3.0-3
+ depends = gcc-multilib-x32=5.3.0-4.1
+ provides = gcc-go=5.3.0-4
+ provides = gcc-go-multilib=5.3.0-4
conflicts = go
conflicts = gcc-go
options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 913bd3cdc178..8482f7874234 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153820 2015-12-21 11:06:03Z allan $
+# $Id: PKGBUILD 161514 2016-02-14 03:40:35Z allan $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# x32 Maintainer: Fantix King <fantix.king@gmail.com>
@@ -10,8 +10,8 @@ pkgname=('gcc-multilib-x32' 'gcc-libs-multilib-x32' 'libx32-gcc-libs' 'gcc-fortr
pkgver=5.3.0
_pkgver=5
_islver=0.15
-pkgrel=3.1
-#_snapshot=5-20150623
+pkgrel=4.1
+_snapshot=5-20160209
pkgdesc="The GNU Compiler Collection for multilib with x32 ABI support"
arch=('x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -20,11 +20,13 @@ makedepends=('binutils>=2.25' 'libmpc' 'gcc-ada-multilib' 'doxygen'
'lib32-glibc>=2.22' 'libx32-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}
@@ -58,6 +60,9 @@ prepare() {
# 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
}
diff --git a/Unlink-the-response-file.patch b/Unlink-the-response-file.patch
new file mode 100644
index 000000000000..55c95a7972c9
--- /dev/null
+++ b/Unlink-the-response-file.patch
@@ -0,0 +1,54 @@
+From f591a95d1532ac7791c146a8e55ba3a32b3e476f Mon Sep 17 00:00:00 2001
+From: ebotcazou <ebotcazou@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
+