reopen 322624
tags 322624 +patch
thanks
Hi,
sorry about that, but I just found out that another patch is needed for
gcc-3.4. Just reactivating hurd-changes.dpatch was not enough, similar
to gcc-4.0, the /include - /usr/include change now has to be made in
gcc/config/gnu.h as well as gcc/config/t-gnu for some reason, otherwise
the build fails like this:
In file included from ../../src/gcc/crtstuff.c:62:
../../src/gcc/tsystem.h:79:19: stdio.h: No such file or directory
Updated hurd-changes.dpatch attached.
cheers,
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
;;
-unpatch)
patch $pdir -f --no-backup-if-mismatch -R -p0 $0
;;
*)
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/t-gnu.old2003-04-27 15:01:15.0 -0400
+++ gcc/config/t-gnu2003-04-27 15:01:48.0 -0400
@@ -1,2 +1,3 @@
# In GNU, /usr is a four-letter word.
-NATIVE_SYSTEM_HEADER_DIR = /include
+# Overridden for Debian GNU/Hurd (hurd-i386)
+NATIVE_SYSTEM_HEADER_DIR = /usr/include
--- gcc/config/gnu.h.orig 2005-08-24 19:11:28.0 +0200
+++ gcc/config/gnu.h2005-08-24 19:22:56.0 +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
+/* Overridden for Debian GNU/Hurd (hurd-i386). */
+#define STANDARD_INCLUDE_DIR /usr/include
/* Implicit library calls should use memcpy, not bcopy, etc. */
#undef TARGET_MEM_FUNCTIONS
