diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 09:50:36 -0700 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 09:50:36 -0700 |
| commit | 2f5fd9680065f15ebb6a3962d9bfac89f383db9a (patch) | |
| tree | 06f1395f8467156b43917b161a49411fc0ac92cf /package/strace/patches | |
| parent | a51cd649c1e7e55ce217d939eac29b11e9a572f0 (diff) | |
| parent | a8bb4a2200eebf863c5a156677d696e98c4644e7 (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'package/strace/patches')
| -rw-r--r-- | package/strace/patches/patch-defs_h | 4 | ||||
| -rw-r--r-- | package/strace/patches/patch-process_c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h index d4a359ef4..c5687b457 100644 --- a/package/strace/patches/patch-defs_h +++ b/package/strace/patches/patch-defs_h @@ -1,5 +1,5 @@ --- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/defs.h 2013-10-25 13:21:18.000000000 +0200 ++++ strace-4.8/defs.h 2014-01-15 12:10:01.000000000 +0100 @@ -37,6 +37,28 @@ # endif #endif @@ -42,7 +42,7 @@ # include <sys/ptrace.h> # undef ptrace -# ifdef POWERPC -+# if defined(POWERPC) || defined(ARM) ++# if defined(ARM) # define __KERNEL__ # include <asm/ptrace.h> # undef __KERNEL__ diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c index 3384b1f4f..b48adddd4 100644 --- a/package/strace/patches/patch-process_c +++ b/package/strace/patches/patch-process_c @@ -1,5 +1,5 @@ --- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200 -+++ strace-4.8/process.c 2013-10-25 13:17:58.000000000 +0200 ++++ strace-4.8/process.c 2014-01-15 12:21:31.000000000 +0100 @@ -55,19 +55,6 @@ # endif #endif |