Bug#315386: gcc-4.0: [patch] hurd-changes update

[Michael Banck <mbanck@debian.org>]

Package: gcc-4.0
Version: 4.0.0-9
Severity: important

Setting of the system header directory changed yet again:

./xgcc -B./ -B/usr/i586-gnu/bin/ -isystem /usr/i586-gnu/include -isystem
/usr/i586-gnu/sys-include -L/build/mbanck/gcc-4.0-4.0.0/build/gcc/../ld
-O2 -DIN_GCC    -W -Wall -Wwrite-strings -Wstrict-prototypes
-Wmissing-prototypes -Wold-style-definition  -isystem ./include  -I. -I.
-I../../src/gcc -I../../src/gcc/. -I../../src/gcc/../include
-I../../src/gcc/../libcpp/include   -g0 -finhibit-size-directive
-fno-inline-functions -fno-exceptions -fno-zero-initialized-in-bss
-fno-unit-at-a-time  \
   -c ../../src/gcc/crtstuff.c -DCRT_BEGIN \
  -o crtbegin.o
In file included from ../../src/gcc/crtstuff.c:64:
../../src/gcc/tsystem.h:90:19: error: stdio.h: No such file or directory
../../src/gcc/tsystem.h:93:23: error: sys/types.h: No such file or
directory
../../src/gcc/tsystem.h:96:19: error: errno.h: No such file or directory
../../src/gcc/tsystem.h:103:20: error: string.h: No such file or
directory
../../src/gcc/tsystem.h:104:20: error: stdlib.h: No such file or
directory
../../src/gcc/tsystem.h:105:20: error: unistd.h: No such file or
directory
In file included from ./include/syslimits.h:7,
                 from ./include/limits.h:11,
                 from ../../src/gcc/tsystem.h:108,
                 from ../../src/gcc/crtstuff.c:64:
./include/limits.h:122:61: error: limits.h: No such file or directory
In file included from ../../src/gcc/crtstuff.c:64:
../../src/gcc/tsystem.h:111:18: error: time.h: No such file or directory
make[4]: *** [crtbegin.o] Error 1

The attached update for hurd-changes.dpatch fixes this.


thanks,

Michael

#! /bin/sh -e

dir=
if [ $# -eq 3 -a "$2" = '-d' ]; then
    pdir="-d $3"
    dir="$3/"
elif [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch)
        patch $pdir -f --no-backup-if-mismatch -p0 < $0
        #cd ${dir}gcc && autoconf
        ;;
    -unpatch)
        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
        #rm ${dir}gcc/configure
        ;;
    *)
        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
        exit 1
esac
exit 0

# DP: Traditional GNU systems don't have a /usr directory.  However, Debian
# DP: systems do, and we support both having a /usr -> . symlink, and having a
# DP: /usr directory like the other ports.  So this patch should NOT go
# DP: upstream.

--- gcc/config/gnu.h.orig	2005-06-22 13:23:24.000000000 +0200
+++ gcc/config/gnu.h	2005-06-22 13:24:18.000000000 +0200
@@ -10,7 +10,8 @@
 
 /* Standard include directory.  In GNU, "/usr" is a four-letter word.  */
 #undef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR "/include"
+/* Overriden for Debian GNU/Hurd.  */
+#define STANDARD_INCLUDE_DIR "/usr/include"
 
 /* The system headers under GNU are C++-aware.  */
 #define NO_IMPLICIT_EXTERN_C