From b415e2a372b555a3264359345e6aa52c10c9e1d7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 14 Aug 2016 22:04:33 -0700 Subject: 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 Signed-off-by: Martin Jansa --- .../udisks/udisks2/non-gnu-libc.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch (limited to 'meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch') 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 @@ +musl does not define __GNUC_PREREQ therefore check for C library being glibc +if not then define the macro + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Index: udisks-2.1.7/udisks/udisksclient.c +=================================================================== +--- udisks-2.1.7.orig/udisks/udisksclient.c ++++ udisks-2.1.7/udisks/udisksclient.c +@@ -27,8 +27,15 @@ + #include "udisksobjectinfo.h" + + /* For __GNUC_PREREQ usage below */ +-#ifdef __GNUC__ ++#ifdef __GLIBC__ + # include ++#else ++#if defined(__GNUC__) ++#define __GNUC_PREREQ(__maj, __min) \ ++ (__GNUC__ > (__maj) || __GNUC__ == (__maj) && __GNUC_MINOR__ >= (__min)) ++#else ++#define __GNUC_PREREQ(__maj, __min) 0 ++#endif + #endif + + /** -- cgit v1.2.3-54-g00ecf