summaryrefslogtreecommitdiff
path: root/package/strace/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-12 21:10:52 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-12 21:10:52 +0200
commit681a668edf704bbb000a49c835b3d71fa7035d86 (patch)
tree27df7d51e37260f63812466b31369c1a144cdc45 /package/strace/patches
parent2d1f73d4334593134d3a47704a2614ffcae384ae (diff)
parent6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/strace/patches')
-rw-r--r--package/strace/patches/patch-Makefile_in21
-rw-r--r--package/strace/patches/patch-net_c10
2 files changed, 11 insertions, 20 deletions
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
index c93da1102..38329e3ac 100644
--- a/package/strace/patches/patch-Makefile_in
+++ b/package/strace/patches/patch-Makefile_in
@@ -1,10 +1,11 @@
---- strace-4.5.20.orig/Makefile.in 2010-04-14 21:41:05.000000000 +0200
-+++ strace-4.5.20/Makefile.in 2010-12-28 22:43:17.000000000 +0100
-@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig
- linux/ioctlent.h linux/errnoent.h linux/signalent.h \
- linux/syscall.h linux/dummy.h \
- linux/i386/syscallent.h \
-+ linux/cris/syscallent.h \
- linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- linux/alpha/signalent.h linux/alpha/syscallent.h \
- linux/arm/syscallent.h linux/arm/syscallent1.h \
+--- strace-4.6.orig/Makefile.in 2011-03-15 19:23:18.000000000 +0100
++++ strace-4.6/Makefile.in 2011-09-02 09:14:19.198484990 +0200
+@@ -270,7 +270,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tests
++SUBDIRS =
+ man_MANS = strace.1
+ bin_SCRIPTS = strace-graph
+
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index a0dc31029..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.19.orig/net.c 2009-09-01 21:53:29.000000000 +0200
-+++ strace-4.5.19/net.c 2009-12-03 23:35:36.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <net/if.h>
- #if defined(LINUX)
- #include <asm/types.h>
-+#include <linux/netlink.h>
- #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
- # include <netipx/ipx.h>
- #else