scripts/addToolsVersion: properly handle .in vs. .in.2
While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).
Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.
So, for each tool, we need to explicitly know what file to munge.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/gentoo/08_all_gcc-4.1-cross-compile.patch
2 Some notes on the 'bootstrap with or without libc headers' debate:
3 http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
4 http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
6 diff -durN gcc-4.3.2.orig/gcc/configure gcc-4.3.2/gcc/configure
7 --- gcc-4.3.2.orig/gcc/configure 2008-08-01 11:51:03.000000000 +0200
8 +++ gcc-4.3.2/gcc/configure 2008-09-23 19:39:43.000000000 +0200
9 @@ -13442,7 +13442,7 @@
10 | powerpc*-*-*,powerpc64*-*-*)
11 CROSS="$CROSS -DNATIVE_CROSS" ;;
13 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
14 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
15 SYSTEM_HEADER_DIR=$build_system_header_dir
18 diff -durN gcc-4.3.2.orig/gcc/configure.ac gcc-4.3.2/gcc/configure.ac
19 --- gcc-4.3.2.orig/gcc/configure.ac 2008-08-01 11:51:03.000000000 +0200
20 +++ gcc-4.3.2/gcc/configure.ac 2008-09-23 19:39:43.000000000 +0200
22 | powerpc*-*-*,powerpc64*-*-*)
23 CROSS="$CROSS -DNATIVE_CROSS" ;;
25 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
26 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
27 SYSTEM_HEADER_DIR=$build_system_header_dir
30 diff -durN gcc-4.3.2.orig/gcc/unwind-dw2.c gcc-4.3.2/gcc/unwind-dw2.c
31 --- gcc-4.3.2.orig/gcc/unwind-dw2.c 2007-07-25 20:14:57.000000000 +0200
32 +++ gcc-4.3.2/gcc/unwind-dw2.c 2008-09-23 19:39:43.000000000 +0200
38 #ifdef MD_UNWIND_SUPPORT
39 #include MD_UNWIND_SUPPORT
43 /* Extract any interesting information from the CIE for the translation
44 unit F belongs to. Return a pointer to the byte after the augmentation,