aboutsummaryrefslogtreecommitdiffstats
path: root/devel/sigar
diff options
context:
space:
mode:
authorantoine <antoine@FreeBSD.org>2016-12-24 20:27:42 +0800
committerantoine <antoine@FreeBSD.org>2016-12-24 20:27:42 +0800
commit403e03e008cf4c7de2b83b0a9c07718e560e556f (patch)
treea8e1ef7364ce531be435a60b75a472b17cf06868 /devel/sigar
parent2a31a09482396f89bb22cc04a86a5496b7f6559f (diff)
downloadfreebsd-ports-gnome-403e03e008cf4c7de2b83b0a9c07718e560e556f.tar.gz
freebsd-ports-gnome-403e03e008cf4c7de2b83b0a9c07718e560e556f.tar.zst
freebsd-ports-gnome-403e03e008cf4c7de2b83b0a9c07718e560e556f.zip
Unbreak build on head: v_cache_count was removed from struct vmmeter in
base r309017 as it was no longer used (always zero). Reported by: pkg-fallout
Diffstat (limited to 'devel/sigar')
-rw-r--r--devel/sigar/files/patch-src_os_darwin_darwin__sigar.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c b/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c
index 19874dc574cd..ca472df06443 100644
--- a/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c
+++ b/devel/sigar/files/patch-src_os_darwin_darwin__sigar.c
@@ -1,9 +1,12 @@
--- src/os/darwin/darwin_sigar.c.orig 2014-11-17 21:46:20 UTC
+++ src/os/darwin/darwin_sigar.c
-@@ -400,8 +400,10 @@ static int sigar_vmstat(sigar_t *sigar,
+@@ -399,9 +399,13 @@ static int sigar_vmstat(sigar_t *sigar,
+ GET_VM_STATS(vm, v_active_count, 0);
GET_VM_STATS(vm, v_inactive_target, 0);
GET_VM_STATS(vm, v_inactive_count, 1);
++#if (__FreeBSD_version < 1200016 )
GET_VM_STATS(vm, v_cache_count, 1);
++#endif
+#if (__FreeBSD_version < 1100079 )
GET_VM_STATS(vm, v_cache_min, 0);
GET_VM_STATS(vm, v_cache_max, 0);
@@ -11,3 +14,15 @@
GET_VM_STATS(vm, v_pageout_free_min, 0);
GET_VM_STATS(vm, v_interrupt_free_min, 0);
GET_VM_STATS(vm, v_forks, 0);
+@@ -479,7 +483,11 @@ int sigar_mem_get(sigar_t *sigar, sigar_
+ kern *= sigar->pagesize;
+ #elif defined(__FreeBSD__)
+ if ((status = sigar_vmstat(sigar, &vmstat)) == SIGAR_OK) {
++#if (__FreeBSD_version < 1200016 )
+ kern = vmstat.v_cache_count + vmstat.v_inactive_count;
++#else
++ kern = vmstat.v_inactive_count;
++#endif
+ kern *= sigar->pagesize;
+ mem->free = vmstat.v_free_count;
+ mem->free *= sigar->pagesize;