[pkgsrc/trunk]: pkgsrc/sysutils/strace compile fixes for a leaf package for n...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a42ea9ea1e6
branches:  trunk
changeset: 568947:9a42ea9ea1e6
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Dec 29 22:03:41 2009 +0000

description:
compile fixes for a leaf package for non-x86 NetBSD
(note that there are no claims of making it actually work)

diffstat:

 sysutils/strace/distinfo         |   6 +++---
 sysutils/strace/patches/patch-ao |  23 ++++++++++++++++-------
 sysutils/strace/patches/patch-au |  17 +++++++++++++----
 3 files changed, 32 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r 7158214fc8bd -r 9a42ea9ea1e6 sysutils/strace/distinfo
--- a/sysutils/strace/distinfo  Tue Dec 29 21:51:00 2009 +0000
+++ b/sysutils/strace/distinfo  Tue Dec 29 22:03:41 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2009/12/07 05:06:37 dholland Exp $
+$NetBSD: distinfo,v 1.14 2009/12/29 22:03:41 spz Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -17,13 +17,13 @@
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
 SHA1 (patch-an) = 23b55878f0f7c6b83b937219a3c730ec5c6cb7ea
-SHA1 (patch-ao) = f85b132184318367a04652d67540428e4d73db3e
+SHA1 (patch-ao) = 90c47a7437204258b7d17986f5a5a94a196d0a38
 SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
 SHA1 (patch-aq) = 41aa25ad9c1603e3202ec6dd381d4f6687ff5df0
 SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
 SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
-SHA1 (patch-au) = 44dc141b5877866ff452211a57f2ebf6fd63a0d0
+SHA1 (patch-au) = 39ce7d7234ac3df0a7db24d0310989015b981a91
 SHA1 (patch-av) = 3ef234b5b6430744c91f6862afff1d733857dac9
 SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
 SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
diff -r 7158214fc8bd -r 9a42ea9ea1e6 sysutils/strace/patches/patch-ao
--- a/sysutils/strace/patches/patch-ao  Tue Dec 29 21:51:00 2009 +0000
+++ b/sysutils/strace/patches/patch-ao  Tue Dec 29 22:03:41 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.3 2007/12/05 16:31:00 christos Exp $
+$NetBSD: patch-ao,v 1.4 2009/12/29 22:03:41 spz Exp $
 
---- process.c.orig     2007-01-11 17:08:38.000000000 -0500
-+++ process.c  2007-12-05 11:21:20.000000000 -0500
+--- process.c.orig     2007-01-11 23:08:38.000000000 +0100
++++ process.c  2009-12-29 21:57:56.000000000 +0100
 @@ -40,6 +40,7 @@
  #include "defs.h"
  
@@ -115,7 +115,16 @@
        { PT_TRACE_ME,          "PT_TRACE_ME"           },
        { PT_READ_I,            "PT_READ_I"             },
        { PT_READ_D,            "PT_READ_D"             },
-@@ -2289,13 +2292,17 @@
+@@ -2282,20 +2285,26 @@
+ #endif
+       { PT_CONTINUE,          "PT_CONTINUE"           },
+       { PT_KILL,              "PT_KILL"               },
++#if !(defined(NETBSD) && (defined(ALPHA) || defined(SPARC) || defined(SPARC64)))
+       { PT_STEP,              "PT_STEP"               },
++#endif
+       { PT_ATTACH,            "PT_ATTACH"             },
+       { PT_DETACH,            "PT_DETACH"             },
+       { PT_GETREGS,           "PT_GETREGS"            },
        { PT_SETREGS,           "PT_SETREGS"            },
        { PT_GETFPREGS,         "PT_GETFPREGS"          },
        { PT_SETFPREGS,         "PT_SETFPREGS"          },
@@ -135,7 +144,7 @@
  #ifndef SUNOS4_KERNEL_ARCH_KLUDGE
  static
  #endif /* !SUNOS4_KERNEL_ARCH_KLUDGE */
-@@ -2982,12 +2989,14 @@
+@@ -2982,12 +2991,14 @@
  sys_ptrace(tcp)
  struct tcb *tcp;
  {
@@ -151,7 +160,7 @@
                          "PTRACE_???"
  #else
                          "PT_???"
-@@ -2995,7 +3004,7 @@
+@@ -2995,7 +3006,7 @@
                        );
                tprintf(", %lu, ", tcp->u_arg[1]);
                addr = tcp->u_arg[2];
@@ -160,7 +169,7 @@
                if (tcp->u_arg[0] == PTRACE_PEEKUSER
                        || tcp->u_arg[0] == PTRACE_POKEUSER) {
                        for (x = struct_user_offsets; x->str; x++) {
-@@ -3057,10 +3066,10 @@
+@@ -3057,10 +3068,10 @@
                }
        }
  #endif /* SUNOS4 */
diff -r 7158214fc8bd -r 9a42ea9ea1e6 sysutils/strace/patches/patch-au
--- a/sysutils/strace/patches/patch-au  Tue Dec 29 21:51:00 2009 +0000
+++ b/sysutils/strace/patches/patch-au  Tue Dec 29 22:03:41 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.3 2007/12/05 16:31:01 christos Exp $
+$NetBSD: patch-au,v 1.4 2009/12/29 22:03:41 spz Exp $
 
---- syscall.c.orig     2006-12-21 17:13:33.000000000 -0500
-+++ syscall.c  2007-12-05 11:16:26.000000000 -0500
+--- syscall.c.orig     2006-12-21 23:13:33.000000000 +0100
++++ syscall.c  2009-12-29 21:45:24.000000000 +0100
 @@ -38,9 +38,9 @@
  #include <signal.h>
  #include <time.h>
@@ -19,7 +19,7 @@
  
 +#ifdef NETBSD
 +#include <machine/reg.h>
-+#include <x86/psl.h>
++#include <machine/psl.h>
 +#endif
  #ifdef HAVE_SYS_REG_H
  #include <sys/reg.h>
@@ -40,6 +40,15 @@
  #endif
  
  struct tcb *tcp_last = NULL;
+@@ -747,7 +753,7 @@
+ #endif
+ 
+       if (   sys_execve == func
+-#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4)
++#if !defined(NETBSD) && (defined(SPARC) || defined(SPARC64) || defined(SUNOS4))
+           || sys_execv == func
+ #endif
+ #if UNIXWARE > 2
 @@ -756,9 +762,12 @@
           )
                return internal_exec(tcp);