Date: Sun, 6 Jun 2021 05:23:56 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 15e9a4872eb2 - main - devel/libgtop: Fix build issue on 14-CURRENT Message-ID: <202106060523.1565NuxB029566@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=15e9a4872eb227d1adae989b6fb7daa84676f4d3 commit 15e9a4872eb227d1adae989b6fb7daa84676f4d3 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2021-06-06 05:15:20 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2021-06-06 05:23:05 +0000 devel/libgtop: Fix build issue on 14-CURRENT --- .../libgtop/files/patch-sysdeps_freebsd_procmap.c | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c index 54384f9cbe99..a0f64e09184f 100644 --- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c +++ b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c @@ -1,6 +1,15 @@ ---- sysdeps/freebsd/procmap.c.orig 2019-02-04 20:15:22 UTC +--- sysdeps/freebsd/procmap.c.orig 2021-06-06 05:13:00 UTC +++ sysdeps/freebsd/procmap.c -@@ -51,14 +51,15 @@ +@@ -34,6 +34,8 @@ + #include <vm/vm_map.h> + #include <vm/vm.h> + ++#include <stdbool.h> ++ + #define _KVM_VNODE + #include <sys/vnode.h> + #undef _KVM_VNODE +@@ -51,14 +53,15 @@ #define _KERNEL #include <sys/mount.h> #include <ufs/ufs/quota.h> @@ -18,7 +27,7 @@ #if (__FreeBSD_version >= 1101001) #define _KERNEL #include <ufs/ufs/extattr.h> -@@ -95,12 +96,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s +@@ -95,12 +98,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s struct cdev_priv priv; #if __FreeBSD_version < 800039 struct cdev si; @@ -34,7 +43,7 @@ (char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) || kvm_read (server->machine->kd, (gulong) tagptr, (char *) tagstr, sizeof (tagstr)) != sizeof (tagstr)) -@@ -120,7 +123,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s +@@ -120,7 +125,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s return; } @@ -43,7 +52,7 @@ sizeof (inode)) != sizeof (inode)) { glibtop_warn_io_r (server, "kvm_read (inode)"); -@@ -231,6 +234,32 @@ _glibtop_init_proc_map_p (glibtop *server) +@@ -231,6 +236,32 @@ _glibtop_init_proc_map_p (glibtop *server) server->sysdeps.proc_map = _glibtop_sysdeps_proc_map; } @@ -76,7 +85,7 @@ /* Provides detailed information about a process. */ glibtop_map_entry * -@@ -238,13 +267,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ +@@ -238,13 +269,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ pid_t pid) { struct kinfo_proc *pinfo; @@ -92,7 +101,7 @@ memset (buf, 0, sizeof (glibtop_proc_map)); -@@ -273,16 +301,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ +@@ -273,16 +303,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ return NULL; } @@ -109,7 +118,7 @@ /* Walk through the `vm_map_entry' list ... */ /* I tested this a few times with `mmap'; as soon as you write -@@ -292,21 +310,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ +@@ -292,21 +312,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry), vmspace.vm_map.nentries); @@ -138,7 +147,7 @@ if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP)) continue; -@@ -377,7 +391,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ +@@ -377,7 +393,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_ if (entry.protection & VM_PROT_EXECUTE) mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106060523.1565NuxB029566>