patches/strace/4.5.18/170-no_cachectl.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:26:53 2011 +0200 (2011-08-02)
changeset 2592 4908eb2b6f17
permissions -rw-r--r--
scripts/functions: cvs retrieval first tries the mirror for tarballs

The cvs download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via cvs.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard cvs retrieval will kick in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.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.
     6 
     7 This patch adds a check for ARM architecture.
     8 
     9 -Khem
    10 
    11 Here is error
    12 
    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
    23 
    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
    28 @@ -65,7 +65,7 @@
    29  #include <linux/capability.h>
    30  #endif
    31  
    32 -#ifdef SYS_cacheflush
    33 +#if defined SYS_cacheflush && !defined ARM
    34  #include <asm/cachectl.h>
    35  #endif