cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- cope with new statvfs support

Browse Source 
note: this needs a *very* -current system.

from naddy@
ok jasper@ naddy@
This commit is contained in:
ajacoutot 2008-03-17 08:38:31 +00:00
parent fb70c641fb
commit 6d4865512a
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/libgtop2/Makefile
View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.30 2008/02/09 16:52:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.31 2008/03/17 08:38:31 ajacoutot Exp $
COMMENT= portable library for obtaining system information
GNOME_VERSION= 2.20.1
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
PKGNAME= libgtop2-${VERSION}p0
SHARED_LIBS= gtop-2.0 8.0 # .7.0
CATEGORIES= devel
# GPL
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

27
devel/libgtop2/patches/patch-sysdeps_bsd_fsusage_c
View File

@ -1,13 +1,22 @@
$OpenBSD: patch-sysdeps_bsd_fsusage_c,v 1.1 2008/02/09 16:52:25 ajacoutot Exp $
--- sysdeps/bsd/fsusage.c.orig Sat Feb 2 21:06:25 2008
+++ sysdeps/bsd/fsusage.c Sat Feb 2 21:07:11 2008
@@ -55,7 +55,8 @@ _glibtop_bsd_get_fsusage_read_write(glibtop *server,
$OpenBSD: patch-sysdeps_bsd_fsusage_c,v 1.2 2008/03/17 08:38:32 ajacoutot Exp $
--- sysdeps/bsd/fsusage.c.orig Thu Sep 27 22:34:55 2007
+++ sysdeps/bsd/fsusage.c Sun Mar 16 21:39:03 2008
@@ -1,7 +1,7 @@
#include <config.h>
#if !defined(__OpenBSD__)
buf->read = sfs.f_syncreads + sfs.f_asyncreads;
+ buf->flags |= (1 << GLIBTOP_FSUSAGE_READ);
/* Although FreeBSD ships with statvfs it seems incomplete, so prefer statfs */
-#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__OpenBSD__)
#undef HAVE_SYS_STATVFS_H
#undef STAT_STATVFS
#endif
@@ -53,9 +53,7 @@ _glibtop_bsd_get_fsusage_read_write(glibtop *server,
return;
}
-#if !defined(__OpenBSD__)
buf->read = sfs.f_syncreads + sfs.f_asyncreads;
-#endif
buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
- buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
+ buf->flags |= (1 << GLIBTOP_FSUSAGE_WRITE);
buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
}