summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-07 15:50:34 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-07 15:50:34 -0400
commit62c69e7e25c3d60098914e6cc0be4ff2b9a8db00 (patch)
tree3c4de39421c67c1097a7b10aa4b27231643cbbf9
parentfcc08c59ec827bf6672b4288998cab4a98ebd20a (diff)
Disable diskfree on kfreebsd, as I have a build failure on kfreebsd-i386 that is quite likely caused by it.
-rw-r--r--Utility/diskfree.c1
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 0 deletions
diff --git a/Utility/diskfree.c b/Utility/diskfree.c
index 6e9eda930..968d2b8b5 100644
--- a/Utility/diskfree.c
+++ b/Utility/diskfree.c
@@ -27,6 +27,7 @@
# include <sys/mount.h>
# define STATCALL statfs64
# define STATSTRUCT statfs
+# define UNKNOWN /* temporarily disabled; trying to nail down a build failure */
#else
#if defined (__linux__)
/* This is a POSIX standard, so might also work elsewhere. */
diff --git a/debian/changelog b/debian/changelog
index 6306bc859..581c7d04f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (3.20120406) UNRELEASED; urgency=low
+
+ * Disable diskfree on kfreebsd, as I have a build failure on kfreebsd-i386
+ that is quite likely caused by it.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 07 Apr 2012 15:49:41 -0400
+
git-annex (3.20120405) unstable; urgency=low
* Rewrote free disk space checking code, moving the portability