[oe-commits] org.oe.dev Do not include cachectl.h for arm.

[khem commit]

Do not include cachectl.h for arm.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: fd0506c3046746ab53ca605009a53800aa174948
ViewMTN: http://monotone.openembedded.org/revision/info/fd0506c3046746ab53ca605009a53800aa174948
Files:
1
packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch
packages/strace/strace_4.5.14.bb
Diffs:

#
# mt diff -ra1554ef5900bbe31eb90a05678bb83881822cbd4 -rfd0506c3046746ab53ca605009a53800aa174948
#
#
#
# add_file "packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch"
#  content [f63ff36f2d325313c5da12bd61004c60dd4e19a3]
# 
# patch "packages/strace/strace_4.5.14.bb"
#  from [687d8bcb6142bd186b9e43388e768afff45f32d7]
#    to [024b28b25f1ee50ef24eb3f59862d67bc1c27c9b]
#
============================================================
--- packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch	f63ff36f2d325313c5da12bd61004c60dd4e19a3
+++ packages/strace/strace-4.5.14/strace-arm-no-cachectl.patch	f63ff36f2d325313c5da12bd61004c60dd4e19a3
@@ -0,0 +1,34 @@
+
+
+This patch is needed on newer uclibc becuase the uclibc header generation mechanism generates the sysnum.h properly NR_cacheflush is defined for ARM but there is no cachectl.h file which is exported to userspace. Strace assumes that if SYS_cacheflush is defined than it icludes asm/cachectl.h which breaks the build for ARM now.
+
+This patch adds a check for ARM architecture.
+
+-Khem
+
+Here is error
+
+| 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; \
+| 	then mv -f ".deps/term.Tpo" ".deps/term.Po"; else rm -f ".deps/term.Tpo"; exit 1; fi
+| system.c:69:26: error: asm/cachectl.h: No such file or directory
+| make[1]: *** [system.o] Error 1
+| make[1]: *** Waiting for unfinished jobs....
+| signal.c: In function 'sys_sigreturn':
+| signal.c:1221: warning: passing argument 4 of 'ptrace' makes integer from pointer without a cast
+| 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'
+| make: *** [all] Error 2
+| FATAL: oe_runmake failed
+
+Index: strace-4.5.14/system.c
+===================================================================
+--- strace-4.5.14.orig/system.c	2008-05-15 20:23:16.000000000 -0700
++++ strace-4.5.14/system.c	2008-05-15 20:24:03.000000000 -0700
+@@ -65,7 +65,7 @@
+ #include <linux/capability.h>
+ #endif
+ 
+-#ifdef SYS_cacheflush
++#if defined SYS_cacheflush && !defined ARM
+ #include <asm/cachectl.h>
+ #endif
+ 
============================================================
--- packages/strace/strace_4.5.14.bb	687d8bcb6142bd186b9e43388e768afff45f32d7
+++ packages/strace/strace_4.5.14.bb	024b28b25f1ee50ef24eb3f59862d67bc1c27c9b
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://glibc-2.5.patch;patch=1 \
@@ -11,6 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/
            file://sh-syscall-update.patch;patch=1 \
            file://strace-fix-arm-bad-syscall.patch;patch=1 \
            file://strace-undef-syscall.patch;patch=1 \
+           file://strace-arm-no-cachectl.patch;patch=1 \
           "