From c02c3122f6955f20669f9a0e96cfd13f024a2761 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 29 Sep 2009 13:34:52 -0700
Subject: strace: Fix compilation for 4.5.14 and 4.5.18

* Delete drop-ctl-proc.patch its included in mips-sigcontext.patch.
* Delete strace-dont-include-linux-dirent-h.patch as it is not needed
  for 4.5.18.
* Combine the SRC_URIs for mips and non mips in 4.5.14.
* Make 4.5.18 default for mips and mipsel.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/strace/strace_4.5.14.bb | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'recipes/strace/strace_4.5.14.bb')

diff --git a/recipes/strace/strace_4.5.14.bb b/recipes/strace/strace_4.5.14.bb
index d14891727b..88bf8c7f46 100644
--- a/recipes/strace/strace_4.5.14.bb
+++ b/recipes/strace/strace_4.5.14.bb
@@ -1,18 +1,18 @@
 DESCRIPTION = "strace is a system call tracing tool."
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
            file://glibc-2.5.patch;patch=1 \
            file://arm-eabi.patch;patch=1 \
-           file://drop-ctl-proc.patch;patch=1 \
            file://sh-arch-update.patch;patch=1 \
            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 \
            file://strace-dont-include-linux-dirent-h.patch;patch=1 \
+           file://mips-sigcontext.patch;patch=1 \
           "
 
 # The strace-4.5.14-avr32.patch conflicts with some other patches.
@@ -20,27 +20,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
 # not use them when building for the AVR32.
 # The avr32 patch also includes the drop-ctl-proc.patch
 # The AVR32 patches are from http://avr32linux.org/twiki/bin/view/Main/STrace
-SRC_URI_avr32 = \
-    "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
+SRC_URI_avr32 = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
      file://strace-4.5.14-avr32.patch;patch=1 \
      file://strace-4.5.14-avr32-add-syscalls-up-to-sysvipc.patch;patch=1 \
     "
 
-# Again, a different set of patches for MIPS. See http://bugs.openembedded.net/show_bug.cgi?id=2221
-MIPS = "\
-  ${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
-  file://glibc-2.5.patch;patch=1 \
-  file://arm-eabi.patch;patch=1 \
-  file://sh-arch-update.patch;patch=1 \
-  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 \
-  file://mips-sigcontext.patch;patch=1 \
-"
-SRC_URI_mips = "${MIPS}"
-SRC_URI_mipsel = "${MIPS}"
-
 inherit autotools
 
 export INCLUDES = "-I. -I./linux"
-- 
cgit 1.2.3-korg