[arch-commits] Commit in gcc-multilib/trunk (PKGBUILD gcc-4.8-filename-output.patch)

[Jan Steffens]

    Date: Monday, July 29, 2013 @ 18:26:02
  Author: heftig
Revision: 94724

4.8.1-2

Added:
  gcc-multilib/trunk/gcc-4.8-filename-output.patch
Modified:
  gcc-multilib/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   15 ++++++++++-----
 gcc-4.8-filename-output.patch |   17 +++++++++++++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-29 16:25:52 UTC (rev 94723)
+++ PKGBUILD	2013-07-29 16:26:02 UTC (rev 94724)
@@ -7,8 +7,8 @@
 
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
 pkgver=4.8.1
-pkgrel=1
-#_snapshot=4.8-20130502
+pkgrel=2
+_snapshot=4.8-20130725
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -17,9 +17,11 @@
              'lib32-glibc>=2.17')
 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
@@ -42,6 +44,9 @@
   # 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
 }
 

Added: gcc-4.8-filename-output.patch
===================================================================
--- gcc-4.8-filename-output.patch	                        (rev 0)
+++ gcc-4.8-filename-output.patch	2013-07-29 16:26:02 UTC (rev 94724)
@@ -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)
+        {