patches/gcc/4.2.1/310-libgcc_eh.a.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
permissions -rw-r--r--
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>
yann@2672
     1
Vampirised from:
yann@2672
     2
  http://landley.net/hg/aboriginal/file/7e0747a665ab/sources/patches/gcc-core-libgcceh.patch
yann@2672
     3
yann@2672
     4
diff -durN gcc-4.2.2.orig/gcc/mklibgcc.in gcc-4.2.2/gcc/mklibgcc.in
yann@2672
     5
--- gcc-4.2.2.orig/gcc/mklibgcc.in	2006-07-04 22:20:01.000000000 +0200
yann@2672
     6
+++ gcc-4.2.2/gcc/mklibgcc.in	2011-08-31 16:24:03.674690016 +0200
yann@2672
     7
@@ -223,8 +223,8 @@
yann@2672
     8
   if [ "$LIBUNWIND" ]; then
yann@2672
     9
     libunwind_a=$dir/libunwind.a
yann@2672
    10
   fi
yann@2672
    11
+  libgcc_eh_a=$dir/libgcc_eh.a
yann@2672
    12
   if [ "$SHLIB_LINK" ]; then
yann@2672
    13
-    libgcc_eh_a=$dir/libgcc_eh.a
yann@2672
    14
     libgcc_s_so=$dir/libgcc_s${SHLIB_EXT}
yann@2672
    15
     if [ "$LIBUNWIND" ]; then
yann@2672
    16
       libunwind_so=$dir/libunwind${SHLIB_EXT}
yann@2672
    17
@@ -889,11 +889,11 @@
yann@2672
    18
   echo '	chmod 644'  ${ldir}/libgcov.a
yann@2672
    19
   echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcov.a
yann@2672
    20
 
yann@2672
    21
-  if [ "$SHLIB_LINK" ]; then
yann@2672
    22
-    echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
yann@2672
    23
-    echo '	chmod 644'  ${ldir}/libgcc_eh.a
yann@2672
    24
-    echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
yann@2672
    25
+  echo '	$(INSTALL_DATA)' ${dir}/libgcc_eh.a ${ldir}/
yann@2672
    26
+  echo '	chmod 644'  ${ldir}/libgcc_eh.a
yann@2672
    27
+  echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
yann@2672
    28
 
yann@2672
    29
+  if [ "$SHLIB_LINK" ]; then
yann@2672
    30
     shlib_slibdir_qual=
yann@2672
    31
     os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
yann@2672
    32
     if [ "$os_multilib_dir" != . ]; then