diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-08-14 22:04:33 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-22 15:49:23 +0200 |
| commit | b415e2a372b555a3264359345e6aa52c10c9e1d7 (patch) | |
| tree | c42d0a05df9dd7d4e2091f54c3eeb750a234bff3 /meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch | |
| parent | 30eb09f3bbb9583a4e7181858488f6259f4b381e (diff) | |
| download | meta-openembedded-b415e2a372b555a3264359345e6aa52c10c9e1d7.tar.gz | |
udisks2: Update to 2.1.7
Fix below build with musl while here
| ../../udisks-2.1.7/udisks/udisksclient.c:2004:6: warning: '__GNUC_PREREQ' is not defined, evaluates to 0 [-Wundef]
| # if __GNUC_PREREQ(4,6) || __clang__
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch')
| -rw-r--r-- | meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch b/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch new file mode 100644 index 0000000000..98e6c75f24 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | musl does not define __GNUC_PREREQ therefore check for C library being glibc | ||
| 2 | if not then define the macro | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | Index: udisks-2.1.7/udisks/udisksclient.c | ||
| 7 | =================================================================== | ||
| 8 | --- udisks-2.1.7.orig/udisks/udisksclient.c | ||
| 9 | +++ udisks-2.1.7/udisks/udisksclient.c | ||
| 10 | @@ -27,8 +27,15 @@ | ||
| 11 | #include "udisksobjectinfo.h" | ||
| 12 | |||
| 13 | /* For __GNUC_PREREQ usage below */ | ||
| 14 | -#ifdef __GNUC__ | ||
| 15 | +#ifdef __GLIBC__ | ||
| 16 | # include <features.h> | ||
| 17 | +#else | ||
| 18 | +#if defined(__GNUC__) | ||
| 19 | +#define __GNUC_PREREQ(__maj, __min) \ | ||
| 20 | + (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) | ||
| 21 | +#else | ||
| 22 | +#define __GNUC_PREREQ(__maj, __min) 0 | ||
| 23 | +#endif | ||
| 24 | #endif | ||
| 25 | |||
| 26 | /** | ||
