Bug#644502: e2fsprogs: FTBFS on hurd-i386 (and kfreebsd-any)
Package: e2fsprogs
Version: 1.42~WIP-2011-10-05-1
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd
Hello,
The patch inlined below fixes the remaining FTBFS problems for
GNU/Hurd.
It probably fixes the build problems for GNU/kFreeBSD too. The QIF_*
stuff is only used for quota_v2 and kfree seems to have version quota_v1
as their quota.h does not have these defined. For kfreebsd-* quota.h is
at ufs/ not sys/ so the test below also applies to this architecture.
>From the latest build log quotactl is found, and that function is
defined in quota.h.
Thanks!
diff -ur e2fsprogs-1.42~WIP-2011-10-05/lib/quota/quotaio.h
e2fsprogs-1.42~WIP-2011-10-05.modified/lib/quota/quotaio.h
--- e2fsprogs-1.42~WIP-2011-10-05/lib/quota/quotaio.h 2011-10-05
01:18:15.000000000 +0200
+++ e2fsprogs-1.42~WIP-2011-10-05.modified/lib/quota/quotaio.h
2011-10-06 09:45:45.000000000 +0200
@@ -14,6 +14,7 @@
#include "ext2fs/ext2fs.h"
#include "quota.h"
#include "dqblk_v2.h"
+#include "config.h"
/*
* Definitions for disk quotas imposed on the average user
@@ -103,10 +104,14 @@
/* Flags for commit function (have effect only when quota in kernel is
* turned on) */
+#ifdef HAVE_SYS_QUOTA_H
#define COMMIT_USAGE QIF_USAGE
#define COMMIT_LIMITS QIF_LIMITS
#define COMMIT_TIMES QIF_TIMES
#define COMMIT_ALL (COMMIT_USAGE | COMMIT_LIMITS | COMMIT_TIMES)
+#else
+#define COMMIT_ALL 0
+#endif
/* Structure of quotafile operations */
struct quotafile_ops {
Reply to: