diff options
| author | martin <martin@pkgsrc.org> | 2001-08-10 10:25:57 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2001-08-10 10:25:57 +0000 |
| commit | b032c8c32a6717736ae413c7107a5fbc8f39c220 (patch) | |
| tree | aea5109fcc4697d182c5faaaa21fc280d40301f0 /devel/libgtop | |
| parent | ab5201027e71af00f0f9bc1f346df892b3cd6bca (diff) | |
| download | pkgsrc-b032c8c32a6717736ae413c7107a5fbc8f39c220.tar.gz | |
Make this work (again) on non-arm -current.
It needs USRSTACK from machine/vmparam.h, which seems to have been
included indirectly until recently.
XXX - someone should have a look and clean this up!
Diffstat (limited to 'devel/libgtop')
| -rw-r--r-- | devel/libgtop/distinfo | 4 | ||||
| -rw-r--r-- | devel/libgtop/patches/patch-al | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 916be1a5fa4..3bb8f53753e 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2001/07/17 11:02:01 wiz Exp $ +$NetBSD: distinfo,v 1.5 2001/08/10 10:25:57 martin Exp $ SHA1 (libgtop-1.0.12.tar.gz) = 7ff6ae62b599db4bd51b54d4d549627eacfc8509 Size (libgtop-1.0.12.tar.gz) = 882461 bytes @@ -7,7 +7,7 @@ SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0 -SHA1 (patch-al) = 1917262d3edf4c9bea7baffcfd84616188f78f51 +SHA1 (patch-al) = 26645e6922c317673b441868c91893804fb43e9c SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881 SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31 SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777 diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al index fbc42baa38d..e5df586c6a3 100644 --- a/devel/libgtop/patches/patch-al +++ b/devel/libgtop/patches/patch-al @@ -1,7 +1,7 @@ -$NetBSD: patch-al,v 1.11 2000/11/26 09:32:11 tron Exp $ +$NetBSD: patch-al,v 1.12 2001/08/10 10:25:58 martin Exp $ --- sysdeps/freebsd/prockernel.c.orig Sat Oct 16 20:31:43 1999 -+++ sysdeps/freebsd/prockernel.c Sun Nov 26 09:48:04 2000 ++++ sysdeps/freebsd/prockernel.c Fri Aug 10 12:21:52 2001 @@ -34,7 +34,7 @@ #if (!defined __OpenBSD__) && (!defined __bsdi__) #include <sys/user.h> @@ -11,19 +11,21 @@ $NetBSD: patch-al,v 1.11 2000/11/26 09:32:11 tron Exp $ #include <machine/pcb.h> #endif #if defined(__FreeBSD__) && !defined(__alpha__) -@@ -48,6 +48,11 @@ +@@ -48,6 +48,13 @@ #include <osreldate.h> #endif -+#if defined(__NetBSD__) && defined(__arm32__) ++#ifdef __NetBSD__ +#include <machine/vmparam.h> ++#ifdef __arm32__ +#define KERNBASE KERNEL_BASE +#endif ++#endif + static const unsigned long _glibtop_sysdeps_proc_kernel_pstats = (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) + (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) + -@@ -129,8 +134,15 @@ +@@ -129,8 +136,15 @@ glibtop_suid_enter (server); @@ -39,7 +41,7 @@ $NetBSD: patch-al,v 1.11 2000/11/26 09:32:11 tron Exp $ (unsigned long) &u_addr->u_stats, (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) { -@@ -149,8 +161,12 @@ +@@ -149,8 +163,12 @@ buf->flags |= _glibtop_sysdeps_proc_kernel_pstats; } @@ -52,7 +54,7 @@ $NetBSD: patch-al,v 1.11 2000/11/26 09:32:11 tron Exp $ (unsigned long) &u_addr->u_pcb, (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) { -@@ -167,14 +183,39 @@ +@@ -167,14 +185,39 @@ /*xxx FreeBSD/Alpha? */ #endif #else |