From e191a289464c21aafe7478065ea7ed3ddda0766f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 3 Aug 2013 02:14:34 -0700
Subject: Sat Aug  3 02:13:05 PDT 2013

---
 core/gcc/PKGBUILD                      | 17 +++++++++++------
 core/gcc/gcc-4.8-filename-output.patch | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 core/gcc/gcc-4.8-filename-output.patch

(limited to 'core/gcc')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 73d6ef280..f40139fbb 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186997 2013-06-03 02:50:08Z allan $
+# $Id: PKGBUILD 191961 2013-08-02 00:55:05Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,8 +6,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.8.1
-pkgrel=1
-#_snapshot=4.8-20130502
+pkgrel=2
+_snapshot=4.8-20130725
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -15,9 +15,11 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!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
-md5sums=('3b2386c114cd74185aa3754b58a79304')
+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
+        gcc-4.8-filename-output.patch)
+md5sums=('e21f259bc4c44e61e19a780ad5badfeb'
+         '40cb437805e2f7a006aa0d0c3098ab0f')
 
 
 if [ -n "${_snapshot}" ]; then
@@ -40,6 +42,9 @@ prepare() {
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
+  patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch
+
   mkdir ${srcdir}/gcc-build
 }
 
diff --git a/core/gcc/gcc-4.8-filename-output.patch b/core/gcc/gcc-4.8-filename-output.patch
new file mode 100644
index 000000000..6951eb239
--- /dev/null
+++ b/core/gcc/gcc-4.8-filename-output.patch
@@ -0,0 +1,17 @@
+--- gcc/c-family/c-opts.c       (revision 200330)
++++ gcc/c-family/c-opts.c       (working copy)
+@@ -1338,10 +1338,14 @@ c_finish_options (void)
+
+ /* Give CPP the next file given by -include, if any.  */
+ static void
+ push_command_line_include (void)
+ {
++  // This can happen if disabled by -imacros for example.
++  if (include_cursor > deferred_count)
++    return;
++
+   if (!done_preinclude)
+     {
+       done_preinclude = true;
+       if (flag_hosted && std_inc && !cpp_opts->preprocessed)
+        {
-- 
cgit v1.2.3-54-g00ecf