Bug#328973: gcc-4.0: FTBFS on hurd-i386: parts of hurd-changes.dpatch applied upstream

[Michael Banck <mbanck@debian.org>]

Package: gcc-4.0
Version: 4.0.1-8
Severity: important
Tags: patch

Hi,

thanks for enabling libffi.  However, there was a problem building the
latest package, a reject in hurd-changes.dpatch due to some part fixed
upstream in the meantime:

if [ -x debian/patches/hurd-changes.dpatch ]; then true; else chmod +x
debian/patches/hurd-changes.dpatch; fi
if [ -f stamps/02-patch-stamp-hurd-changes ]; then \
  echo "hurd-changes patches already applied."; exit 1; \
fi
DEB_VERSION='4.0.1-8'; export DEB_VERSION; \
debian/patches/hurd-changes.dpatch -patch -d
/build/mbanck/gcc-4.0-4.0.1/src
patching file gcc/config/gnu.h
patching file gcc/config/t-gnu
patching file gcc/tlink.c
patching file gcc/fortran/gfortran.h
Hunk #1 FAILED at 501.
1 out of 1 hunk FAILED -- saving rejects to file
gcc/fortran/gfortran.h.rej
patching file gcc/gthr-posix.h
patching file gcc/ada/adaint.c
make: *** [stamps/02-patch-stamp-hurd-changes] Error 1
******************************************************************************

I have attached an interdiff for hurd-changes.dpatch.  

This will happen every once in a while I'm afraid, as the build failures
are being fixed upstream.  A possible way to detect those earlier would
be to apply the hurd-changes patch on all arches.  However, this would
shift the maintenance burdon somewhat more onto you, and I am fine with
continueing sending patches like this for gcc-4.0 after upload.


cheers,

Michael

-- 
Michael Banck
Debian Developer
mbanck@debian.org
http://www.advogato.org/person/mbanck/diary.html

--- debian/patches/hurd-changes.dpatch	2005-09-18 17:44:22.000000000 +0200
+++ debian/patches/hurd-changes.dpatch.new	2005-09-18 18:01:01.000000000 +0200
@@ -62,21 +62,6 @@
  /* Defined in the automatically-generated underscore.c.  */
  extern int prepends_underscore;
  
---- gcc/fortran/gfortran.h.orig 2005-07-25 21:10:15.000000000 +0200
-+++ gcc/fortran/gfortran.h      2005-07-25 21:11:07.000000000 +0200
-@@ -501,7 +501,11 @@
- #include <limits.h>
- #ifndef PATH_MAX
- # include <sys/param.h>
--# define PATH_MAX MAXPATHLEN
-+# ifdef MAXPATHLEN
-+#  define PATH_MAX MAXPATHLEN
-+# else
-+#  define PATH_MAX 4096
-+# endif
- #endif
-
-
 --- gcc/gthr-posix.h.orig	2005-07-19 13:58:06.000000000 +0200
 +++ gcc/gthr-posix.h	2005-07-23 17:28:14.000000000 +0200
 @@ -40,6 +40,13 @@