CVS commit: pkgsrc/devel/gdb7

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Dec  4 19:04:21 UTC 2022

Modified Files:
        pkgsrc/devel/gdb7: distinfo
        pkgsrc/devel/gdb7/patches: patch-gdb_bsd-kvm.c
Added Files:
        pkgsrc/devel/gdb7/patches: patch-gdb_common_common-defs.h

Log Message:
gdb7: fix it so that it builds on NetBSD/macppc-current.

Also conditionalize use of <sys/user.h>, probably beneficial
for other NetBSD ports.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gdb7/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gdb7/patches/patch-gdb_common_common-defs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gdb7/distinfo
diff -u pkgsrc/devel/gdb7/distinfo:1.3 pkgsrc/devel/gdb7/distinfo:1.4
--- pkgsrc/devel/gdb7/distinfo:1.3      Tue Oct 26 10:14:40 2021
+++ pkgsrc/devel/gdb7/distinfo  Sun Dec  4 19:04:21 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:14:40 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/12/04 19:04:21 he Exp $
 
 BLAKE2s (gdb-7.11.tar.gz) = 249d7d148c5aa36e9040ddbafb515f4c4959d604d2e87be0f6fefcd68011617d
 SHA512 (gdb-7.11.tar.gz) = 6854774bba73ecf02c4d8bb4e194b8fd8fd3c6c661cbead0b3b816b9d9f736df1b85f331a669808700b0ad0f945b58483fffb77d49f5b690e828a00f65c04893
@@ -6,7 +6,8 @@ Size (gdb-7.11.tar.gz) = 35215975 bytes
 SHA1 (patch-Makefile.in) = 48f65798f96fdda2a35eb8b18a7cc2993023bcc7
 SHA1 (patch-ao) = fe55dc7245f438fccb7965ceb220be951f85a535
 SHA1 (patch-gdb_amd64bsd-nat.c) = ce3a52c090bb83b91e87d0fff301ddb2eb2d3dfb
-SHA1 (patch-gdb_bsd-kvm.c) = 837614b107181f79fd5c018ebd76a9010e5ab602
+SHA1 (patch-gdb_bsd-kvm.c) = 0bf346f12a0cb91cbcbd7e849ce0ec982be62a71
+SHA1 (patch-gdb_common_common-defs.h) = 5be634e1657da574908cfef60717bd1fea7a2e31
 SHA1 (patch-gdb_ppcnbsd-nat.c) = 94c9f552fd00e3641e7a0fa8372de538b4571d0b
 SHA1 (patch-opcodes_i386-dis_c) = 57b2b2ce85567faf112ec9f435b9aed0ffc943fb
 SHA1 (patch-sim_ppc_emul_netbsd.c) = 34fcb884c3c82e8eae6cd6f8c87ce42e9354c347

Index: pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c
diff -u pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c:1.1 pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c:1.2
--- pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c:1.1   Mon Jun  5 10:41:28 2017
+++ pkgsrc/devel/gdb7/patches/patch-gdb_bsd-kvm.c       Sun Dec  4 19:04:21 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-gdb_bsd-kvm.c,v 1.1 2017/06/05 10:41:28 maya Exp $
+$NetBSD: patch-gdb_bsd-kvm.c,v 1.2 2022/12/04 19:04:21 he Exp $
 
 (1) (unknown yet)
 (2) +#include <sys/signal.h> part:
@@ -7,6 +7,7 @@ from bsd-kvm.c:36:
 /usr/include/sys/signalvar.h:56: error: field 'sd_sigact' has incomplete type
 /usr/include/sys/signalvar.h:59: error: 'NSIG' undeclared here (not in a function)
 gmake[2]: *** [bsd-kvm.o] Error 1
+(3) properly conditionalize use of <sys/user.h>
 
 --- gdb/bsd-kvm.c.orig 2015-02-19 11:58:07.000000000 +0000
 +++ gdb/bsd-kvm.c
@@ -23,11 +24,14 @@ gmake[2]: *** [bsd-kvm.o] Error 1
  #ifdef HAVE_NLIST_H
  #include <nlist.h>
  #endif
-@@ -36,6 +41,7 @@
+@@ -36,7 +41,10 @@
  #include "readline/readline.h"
  #include <sys/param.h>
  #include <sys/proc.h>
 +#include <sys/types.h>
++#ifdef HAVE_SYS_USER_H
  #include <sys/user.h>
++#endif
  
  #include "bsd-kvm.h"
+ 

Added files:

Index: pkgsrc/devel/gdb7/patches/patch-gdb_common_common-defs.h
diff -u /dev/null pkgsrc/devel/gdb7/patches/patch-gdb_common_common-defs.h:1.1
--- /dev/null   Sun Dec  4 19:04:21 2022
+++ pkgsrc/devel/gdb7/patches/patch-gdb_common_common-defs.h    Sun Dec  4 19:04:21 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-gdb_common_common-defs.h,v 1.1 2022/12/04 19:04:21 he Exp $
+
+Insert a hack for NetBSD/powerpc to bring register_t in scope.
+
+--- gdb/common/common-defs.h.orig      2016-02-10 03:19:39.000000000 +0000
++++ gdb/common/common-defs.h
+@@ -20,6 +20,12 @@
+ #ifndef COMMON_DEFS_H
+ #define COMMON_DEFS_H
+ 
++#ifdef __NetBSD__
++#  ifdef __powerpc__
++#    define _KMEMUSER 1 /* needed for register_t */
++#  endif
++#endif
++
+ #include "config.h"
+ #ifdef GDBSERVER
+ #include "build-gnulib-gdbserver/config.h"