Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/util-linux/files: util-linux-2.18-falloc.patch
Date: Sun, 03 Oct 2010 20:10:09
Message-Id: 20101003200959.3AE5E2003C@flycatcher.gentoo.org
1 vapier 10/10/03 20:09:59
2
3 Added: util-linux-2.18-falloc.patch
4 Log:
5 Fix building with older linux/falloc.h #339432 by Andrew Randrianasulu.
6
7 (Portage version: 2.2_rc86/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sys-apps/util-linux/files/util-linux-2.18-falloc.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-falloc.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/files/util-linux-2.18-falloc.patch?rev=1.1&content-type=text/plain
14
15 Index: util-linux-2.18-falloc.patch
16 ===================================================================
17 From a58285bfb1e37b87c7a85afaead9c9496bc1badb Mon Sep 17 00:00:00 2001
18 From: Mike Frysinger <vapier@g.o>
19 Date: Sun, 3 Oct 2010 15:58:12 -0400
20 Subject: [PATCH] fallocate: fix build failure with old linux headers
21
22 If linux/falloc.h does not exist, the build system still enables the
23 fallocate util, but ultimately fails when it tries to include the
24 header and use a define from it.
25
26 Signed-off-by: Mike Frysinger <vapier@g.o>
27 ---
28 sys-utils/fallocate.c | 6 +++++-
29 1 files changed, 5 insertions(+), 1 deletions(-)
30
31 diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
32 index d1f43c2..fd4d2a9 100644
33 --- a/sys-utils/fallocate.c
34 +++ b/sys-utils/fallocate.c
35 @@ -37,7 +37,11 @@
36 # include <sys/syscall.h>
37 #endif
38
39 -#include <linux/falloc.h> /* for FALLOC_FL_* flags */
40 +#ifdef HAVE_LINUX_FALLOC_H
41 +# include <linux/falloc.h> /* for FALLOC_FL_* flags */
42 +#else
43 +# define FALLOC_FL_KEEP_SIZE 1
44 +#endif
45
46 #include "nls.h"
47 #include "strtosize.h"
48 --
49 1.7.3