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 This patch is needed on newer uclibc becuase the uclibc header generation
2 mechanism generates the sysnum.h properly NR_cacheflush is defined for ARM
3 but there is no cachectl.h file which is exported to userspace. Strace
4 assumes that if SYS_cacheflush is defined than it icludes asm/cachectl.h
5 which breaks the build for ARM now.
7 This patch adds a check for ARM architecture.
13 | if ccache arm-angstrom-linux-uclibcgnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I. -Ilinux/arm -I./linux/arm -Ilinux -I./linux -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -Wall -isystem/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/staging/arm-angstrom-linux-uclibcgnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -MT term.o -MD -MP -MF ".deps/term.Tpo" -c -o term.o term.c; \
14 | then mv -f ".deps/term.Tpo" ".deps/term.Po"; else rm -f ".deps/term.Tpo"; exit 1; fi
15 | system.c:69:26: error: asm/cachectl.h: No such file or directory
16 | make[1]: *** [system.o] Error 1
17 | make[1]: *** Waiting for unfinished jobs....
18 | signal.c: In function 'sys_sigreturn':
19 | signal.c:1221: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast
20 | make[1]: Leaving directory `/home/kraj/work/oe/build/uclibc/tmp-omap5912osk/work/armv5te-angstrom-linux-uclibcgnueabi/strace-4.5.14-r5/strace-4.5.14'
21 | make: *** [all] Error 2
22 | FATAL: oe_runmake failed
24 Index: strace-4.5.14/system.c
25 ===================================================================
26 --- strace-4.5.14.orig/system.c 2008-05-15 20:23:16.000000000 -0700
27 +++ strace-4.5.14/system.c 2008-05-15 20:24:03.000000000 -0700
29 #include <linux/capability.h>
32 -#ifdef SYS_cacheflush
33 +#if defined SYS_cacheflush && !defined ARM
34 #include <asm/cachectl.h>