diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-05-11 10:35:41 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-13 13:41:31 +0100 |
commit | 3a167e62901eef2ac95fac269d2b13d8fdf88c34 (patch) | |
tree | afbad9ff3bd4805ee585f8110c53424fa6ffc92f /meta/recipes-extended/mdadm/files | |
parent | 922c640ca99608fbca4d585095b523cc7b52ceff (diff) | |
download | poky-3a167e62901eef2ac95fac269d2b13d8fdf88c34.tar.gz |
mdadm: Fix build with clang
(From OE-Core rev: d701293b9de2e23cac2f1b57af5b3d44f489c404)
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-mdadm.h-Undefine-dprintf-before-redefining.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch new file mode 100644 index 0000000000..4cf809290d --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 6d369e8f226594632ce4260129509daf7030de0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 9 May 2016 22:03:57 +0000 | ||
4 | Subject: [PATCH] mdadm.h: Undefine dprintf before redefining | ||
5 | |||
6 | dprintf is also defined in libc see | ||
7 | usr/include/bits/stdio2.h, this comes into | ||
8 | play especially when fortify sources is enabled | ||
9 | and compilers like clang reports the override | ||
10 | |||
11 | In file included from policy.c:25: | ||
12 | ./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined] | ||
13 | ^ | ||
14 | /mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | Upstream-Status: Pending | ||
19 | |||
20 | mdadm.h | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/mdadm.h b/mdadm.h | ||
24 | index 230e60f..8c8f4d1 100755 | ||
25 | --- a/mdadm.h | ||
26 | +++ b/mdadm.h | ||
27 | @@ -1554,11 +1554,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) | ||
28 | } | ||
29 | |||
30 | #ifdef DEBUG | ||
31 | +#undef dprintf | ||
32 | #define dprintf(fmt, arg...) \ | ||
33 | fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg) | ||
34 | #define dprintf_cont(fmt, arg...) \ | ||
35 | fprintf(stderr, fmt, ##arg) | ||
36 | #else | ||
37 | +#undef dprintf | ||
38 | #define dprintf(fmt, arg...) \ | ||
39 | ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; }) | ||
40 | #define dprintf_cont(fmt, arg...) \ | ||
41 | -- | ||
42 | 1.9.1 | ||
43 | |||