Bug#343640: gcc-4.0: FTBFS on hurd-i386: conflicting patches getting applied

[Michael Banck <mbanck@debian.org>]

Package: gcc-4.0
Version: 4.0.2-5
Severity: important

Hi,

since libgcj has been split off, both libffi-without-libgcj and
disable-libgcj are getting applied on hurd-i386, which leads to a
rejected patch in the latter:

DEB_VERSION='4.0.2-5'; export DEB_VERSION; \
debian/patches/disable-libgcj.dpatch -patch -d
/build/buildd/gcc-4.0-4.0.2/src
patching file configure.in
Hunk #1 FAILED at 171.
1 out of 1 hunk FAILED -- saving rejects to file configure.in.rej
patching file configure
Hunk #1 FAILED at 937.
1 out of 1 hunk FAILED -- saving rejects to file configure.rej
make: *** [stamps/02-patch-stamp-disable-libgcj] Error 1

The full build log can be found here:
http://experimental.ftbfs.de/fetch.php?&pkg=gcc-4.0&ver=4.0.2-5&arch=hurd-i386&stamp=1134709009&file=log&as=raw

Before the split, only libffi-without-libgcj got applied.

Hurd-i386 is in java_no_systems for the time being, so maybe add another
check for with_java to the disable-libgcj patch and only apply it when
java would be built anyway?

I am not sure how the two source packages are tied together, so I am not
sending a patch at this point, but I can try to come up with one if you
prefer.


cheers,

Michael