diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-12-18 22:39:52 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-20 15:22:16 +0000 |
commit | 0cc22efe40567ac629c79044fe8b2439a7771ae9 (patch) | |
tree | d4d7f754054325dfba7632a251371be46b226ed6 /meta/recipes-extended/mdadm/files | |
parent | a6a49f763f164feea39c37d53d5afc1244ca9aa6 (diff) | |
download | poky-0cc22efe40567ac629c79044fe8b2439a7771ae9.tar.gz |
mdadm: Fix build with glibc 2.25
(From OE-Core rev: 32643ed355c94035d6fabbd0cd9e4c6f3b18ab56)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/mdadm/files')
-rw-r--r-- | meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch b/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch new file mode 100644 index 0000000000..acd64ada22 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-include-sys-sysmacros.h-for-major-minor-defintions.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 943616e5dffb79f307e4bd9b249d316212998750 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 18 Dec 2016 08:30:51 +0000 | ||
4 | Subject: [PATCH] include <sys/sysmacros.h> for major/minor defintions | ||
5 | |||
6 | glibc 2.25 is warning about it if applications depend on | ||
7 | sys/types.h for these macros, it expects to be included | ||
8 | from <sys/sysmacros.h> | ||
9 | |||
10 | Fixes | ||
11 | | Grow.c:3534:13: error: In the GNU C Library, "minor" is defined | ||
12 | | by <sys/sysmacros.h>. For historical compatibility, it is | ||
13 | | currently defined by <sys/types.h> as well, but we plan to | ||
14 | | remove this soon. To use "minor", include <sys/sysmacros.h> | ||
15 | | directly. If you did not intend to use a system-defined macro | ||
16 | | "minor", you should undefine it after including <sys/types.h>. [-Werror] | ||
17 | | Query.c: In function 'Query': | ||
18 | | Query.c:105:13: error: In the GNU C Library, "makedev" is defined | ||
19 | | by <sys/sysmacros.h>. For historical compatibility, it is | ||
20 | | currently defined by <sys/types.h> as well, but we plan to | ||
21 | | remove this soon. To use "makedev", include <sys/sysmacros.h> | ||
22 | | directly. If you did not intend to use a system-defined macro | ||
23 | | "makedev", you should undefine it after including <sys/types.h>. [-Werror] | ||
24 | | makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev) | ||
25 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
26 | |||
27 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
28 | --- | ||
29 | Upstream-Status: Pending | ||
30 | |||
31 | mdadm.h | 1 + | ||
32 | 1 file changed, 1 insertion(+) | ||
33 | |||
34 | diff --git a/mdadm.h b/mdadm.h | ||
35 | index 8c8f4d1..3ce13b5 100755 | ||
36 | --- a/mdadm.h | ||
37 | +++ b/mdadm.h | ||
38 | @@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); | ||
39 | #endif | ||
40 | |||
41 | #include <sys/types.h> | ||
42 | +#include <sys/sysmacros.h> | ||
43 | #include <sys/stat.h> | ||
44 | #include <stdint.h> | ||
45 | #include <stdlib.h> | ||
46 | -- | ||
47 | 1.9.1 | ||
48 | |||