diff options
| author | kristerw <kristerw@pkgsrc.org> | 2004-03-01 03:39:56 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2004-03-01 03:39:56 +0000 |
| commit | ed082d4225babd21b5df71a612daa4bbd45decb1 (patch) | |
| tree | a77f6f43ecd606cbecf5663dad8c1fd826eb123e | |
| parent | 4d6c2c7996da022882cd8b10567e823dd58e9a97 (diff) | |
| download | pkgsrc-ed082d4225babd21b5df71a612daa4bbd45decb1.tar.gz | |
Make this package build on amd64 with a patch from Richard Rauch in
PR pkg/24403.
| -rw-r--r-- | devel/libgtop/Makefile | 4 | ||||
| -rw-r--r-- | devel/libgtop/distinfo | 4 | ||||
| -rw-r--r-- | devel/libgtop/patches/patch-al | 14 |
3 files changed, 13 insertions, 9 deletions
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index f778dc6692d..a131cce6da7 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2004/02/14 17:21:38 jlam Exp $ +# $NetBSD: Makefile,v 1.79 2004/03/01 03:39:56 kristerw Exp $ DISTNAME= libgtop-1.0.13 PKGREVISION= 4 @@ -18,7 +18,7 @@ OSVERSION_SPECIFIC= yes .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == NetBSD -. if (${MACHINE_ARCH} != alpha) && \ +. if (${MACHINE_ARCH} != alpha) && (${MACHINE_ARCH} != x86_64) && \ (${MACHINE_ARCH} != arm) && (${MACHINE_ARCH} != arm32) && \ (${MACHINE_ARCH} != i386) && (${MACHINE_ARCH} != m68k) && \ (${MACHINE_ARCH} != mipsel) && (${MACHINE_ARCH} != powerpc) && \ diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index 9590eb4f5d5..3dfda0f0a5d 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2003/01/21 10:12:30 tron Exp $ +$NetBSD: distinfo,v 1.12 2004/03/01 03:39:56 kristerw Exp $ SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072 Size (libgtop-1.0.13.tar.bz2) = 733873 bytes @@ -9,7 +9,7 @@ SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0 SHA1 (patch-af) = 6874f04a186a4dccfecadaa2e40a372bc9f2e2fe SHA1 (patch-ag) = eb02b990d1316ac5f2ec0430e49b9c4487c6dab8 -SHA1 (patch-al) = 1d24ce5af3fcabe0a50abaebd07e24c606fad9cf +SHA1 (patch-al) = 15c860638199d3d8c260b89b3fb70ced5054a69c 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 94f7c4d0647..4c159d871a5 100644 --- a/devel/libgtop/patches/patch-al +++ b/devel/libgtop/patches/patch-al @@ -1,7 +1,7 @@ -$NetBSD: patch-al,v 1.14 2003/01/21 10:12:31 tron Exp $ +$NetBSD: patch-al,v 1.15 2004/03/01 03:39:57 kristerw Exp $ ---- sysdeps/freebsd/prockernel.c.orig Mon Nov 26 23:37:59 2001 -+++ sysdeps/freebsd/prockernel.c Tue Jan 21 11:09:24 2003 +--- sysdeps/freebsd/prockernel.c.orig 2001-11-26 23:37:59.000000000 +0100 ++++ sysdeps/freebsd/prockernel.c 2004-03-01 03:44:24.000000000 +0100 @@ -34,7 +34,7 @@ #if (!defined __OpenBSD__) && (!defined __bsdi__) #include <sys/user.h> @@ -74,7 +74,7 @@ $NetBSD: patch-al,v 1.14 2003/01/21 10:12:31 tron Exp $ (unsigned long) &u_addr->u_pcb, (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) { -@@ -167,14 +190,39 @@ +@@ -167,15 +190,43 @@ /*xxx FreeBSD/Alpha? */ #endif #else @@ -90,6 +90,9 @@ $NetBSD: patch-al,v 1.14 2003/01/21 10:12:31 tron Exp $ +#if defined(__m68k__) + buf->kstk_esp = (u_int64_t) pcb.pcb_usp; + buf->kstk_eip = (u_int64_t) 0; ++#elif defined(__x86_64__) ++ buf->kstk_esp = (u_int64_t) pcb.pcb_usersp; ++ buf->kstk_eip = (u_int64_t) 0; +#elif (defined(__arm32__) || defined(__powerpc__)) + buf->kstk_esp = (u_int64_t) pcb.pcb_sp; + buf->kstk_eip = (u_int64_t) 0; @@ -110,7 +113,8 @@ $NetBSD: patch-al,v 1.14 2003/01/21 10:12:31 tron Exp $ +#endif /* __NetBSD__ */ buf->flags |= _glibtop_sysdeps_proc_kernel_pcb; -+#endif #endif ++#endif } + /* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */ |