mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 19:47:17 +00:00
Code Issues Projects Releases Wiki Activity

udisks2: Update to 2.1.7

Browse Source 
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>
This commit is contained in:
Khem Raj
2016-08-14 22:04:33 -07:00
committed by Martin Jansa
parent 30eb09f3bb
commit b415e2a372
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch
+26
View File
@@ -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 <raj.khem@gmail.com>
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 <features.h>
+#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
/**