Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.1/130-cross-compile.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 1393 b432bd628b10
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10. 
     1 diff -durN gcc-4.4.0.orig/gcc/configure gcc-4.4.0/gcc/configure

     2 --- gcc-4.4.0.orig/gcc/configure	2009-03-24 18:46:03.000000000 +0100

     3 +++ gcc-4.4.0/gcc/configure	2009-05-27 21:38:06.000000000 +0200

     4 @@ -13997,7 +13997,7 @@

     5  	    | powerpc*-*-*,powerpc64*-*-*)

     6  		CROSS="$CROSS -DNATIVE_CROSS" ;;

     7  	esac

     8 -elif test "x$TARGET_SYSTEM_ROOT" != x; then

     9 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then

    10          SYSTEM_HEADER_DIR=$build_system_header_dir

    11  fi

    12  

    13 diff -durN gcc-4.4.0.orig/gcc/configure.ac gcc-4.4.0/gcc/configure.ac

    14 --- gcc-4.4.0.orig/gcc/configure.ac	2009-03-24 18:46:03.000000000 +0100

    15 +++ gcc-4.4.0/gcc/configure.ac	2009-05-27 21:38:06.000000000 +0200

    16 @@ -1720,7 +1720,7 @@

    17  	    | powerpc*-*-*,powerpc64*-*-*)

    18  		CROSS="$CROSS -DNATIVE_CROSS" ;;

    19  	esac

    20 -elif test "x$TARGET_SYSTEM_ROOT" != x; then

    21 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then

    22          SYSTEM_HEADER_DIR=$build_system_header_dir 

    23  fi

    24  

    25 diff -durN gcc-4.4.0.orig/gcc/unwind-dw2.c gcc-4.4.0/gcc/unwind-dw2.c

    26 --- gcc-4.4.0.orig/gcc/unwind-dw2.c	2009-04-10 01:23:07.000000000 +0200

    27 +++ gcc-4.4.0/gcc/unwind-dw2.c	2009-05-27 21:38:06.000000000 +0200

    28 @@ -329,9 +329,11 @@

    29  }

    30  #endif

    31  

    32 +#ifndef inhibit_libc

    33  #ifdef MD_UNWIND_SUPPORT

    34  #include MD_UNWIND_SUPPORT

    35  #endif

    36 +#endif

    37  

    38  /* Extract any interesting information from the CIE for the translation

    39     unit F belongs to.  Return a pointer to the byte after the augmentation,
crosstool-ng