Attachment 222895 Details for Bug 253928 – Fix build under 14-CURRENT

[patch] Fix build under 14-CURRENT

libgtop.diff (text/plain), 2.72 KB, created by Cy Schubert on 2021-03-01 04:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2021-03-01 04:29:36 UTC

Size: 2.72 KB

patch

obsolete

>diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
>index 28b48ddf60db..aa73b630720b 100644
>--- a/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
>+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procmap.c
>@@ -1,6 +1,16 @@
>---- sysdeps/freebsd/procmap.c.orig	2017-08-07 22:43:41 UTC
>-+++ sysdeps/freebsd/procmap.c
>-@@ -52,6 +52,8 @@
>+--- sysdeps/freebsd/procmap.c.orig	2019-02-04 12:15:22.000000000 -0800
>++++ sysdeps/freebsd/procmap.c	2021-02-28 20:24:04.037866000 -0800
>+@@ -19,6 +19,9 @@
>+    Boston, MA 02110-1301, USA.
>+ */
>+ 
>++#define _KERNEL
>++#include <sys/types.h>
>++#undef _KERNEL
>+ #include <config.h>
>+ #include <glibtop.h>
>+ #include <glibtop/error.h>
>+@@ -52,6 +55,8 @@
>  #include <sys/mount.h>
>  #include <ufs/ufs/quota.h>
>  #include <ufs/ufs/inode.h>
>@@ -9,7 +19,7 @@
>  #include <fs/devfs/devfs.h>
>  #if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__)
>  #include <fs/devfs/devfs_int.h>
>-@@ -95,12 +97,14 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, s
>+@@ -95,12 +100,14 @@
>          struct cdev_priv priv;
>  #if __FreeBSD_version < 800039
>          struct cdev si;
>@@ -25,7 +35,7 @@
>   	             (char *) &tagptr, sizeof (tagptr)) != sizeof (tagptr) ||
>              kvm_read (server->machine->kd, (gulong) tagptr,
>  		     (char *) tagstr, sizeof (tagstr)) != sizeof (tagstr))
>-@@ -231,6 +235,32 @@ _glibtop_init_proc_map_p (glibtop *server)
>+@@ -231,6 +238,32 @@
>          server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
>  }
>  
>@@ -58,7 +68,7 @@
>  /* Provides detailed information about a process. */
>  
>  glibtop_map_entry *
>-@@ -238,13 +268,12 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
>+@@ -238,13 +271,12 @@
>                          pid_t pid)
>  {
>          struct kinfo_proc *pinfo;
>@@ -74,7 +84,7 @@
>  
>          memset (buf, 0, sizeof (glibtop_proc_map));
>  
>-@@ -273,16 +302,6 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
>+@@ -273,16 +305,6 @@
>                  return NULL;
>          }
>  
>@@ -91,7 +101,7 @@
>          /* Walk through the `vm_map_entry' list ... */
>  
>          /* I tested this a few times with `mmap'; as soon as you write
>-@@ -292,21 +311,17 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
>+@@ -292,21 +314,17 @@
>          maps = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_map_entry),
>                                   vmspace.vm_map.nentries);
>  
>@@ -120,7 +130,7 @@
>  
>                  if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
>                          continue;
>-@@ -377,7 +392,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_
>+@@ -377,7 +395,7 @@
>                  if (entry.protection & VM_PROT_EXECUTE)
>                          mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
>

Actions: View | Diff

Attachments on bug 253928: 222895