root/current/emdebian/trunk/buildcross/trunk/patches/gcc-3.3.6-emdebian-cross.dpatch

Revision 826 (by zumbi, 03/27/07 21:30:34)

final fix for gcc-3.3

#! /bin/sh -e
 
# DP: enable biarch for 31 bit compiler
 
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 -p1 < $0
        ;;
    -unpatch)
        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
        ;;
    *)
        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
        exit 1
esac
exit 0


--- src/gcc/cppdefault.c.orig	2007-03-27 02:12:33.000000000 +0000
+++ src/gcc/cppdefault.c	2007-03-27 02:27:54.000000000 +0000
@@ -47,10 +47,6 @@
     /* /usr/local/include comes before the fixincluded header files.  */
     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1 },
 #endif
-#ifdef MULTIARCH_LOCAL_INCLUDE_DIR
-    /* /usr/local/include/$target_alias comes before the fixincluded header files.  */
-    { MULTIARCH_LOCAL_INCLUDE_DIR, 0, 0, 1, 1 },
-#endif
 #ifdef PREFIX_INCLUDE_DIR
     { PREFIX_INCLUDE_DIR, 0, 0, 1, 0 },
 #endif
@@ -70,9 +66,6 @@
     /* Some systems have an extra dir of include files.  */
     { SYSTEM_INCLUDE_DIR, 0, 0, 0, 1 },
 #endif
-#ifdef MULTIARCH_STANDARD_INCLUDE_DIR
-    { MULTIARCH_STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1 },
-#endif
 #ifdef STANDARD_INCLUDE_DIR
     /* /usr/include comes dead last.  */
     { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1 },
Note: See TracBrowser for help on using the browser.