aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/udisks
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-14 22:04:33 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-22 15:49:23 +0200
commitb415e2a372b555a3264359345e6aa52c10c9e1d7 (patch)
treec42d0a05df9dd7d4e2091f54c3eeb750a234bff3 /meta-oe/recipes-support/udisks
parent30eb09f3bbb9583a4e7181858488f6259f4b381e (diff)
downloadmeta-openembedded-contrib-b415e2a372b555a3264359345e6aa52c10c9e1d7.tar.gz
meta-openembedded-contrib-b415e2a372b555a3264359345e6aa52c10c9e1d7.tar.bz2
meta-openembedded-contrib-b415e2a372b555a3264359345e6aa52c10c9e1d7.zip
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')
-rw-r--r--meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch26
-rw-r--r--meta-oe/recipes-support/udisks/udisks2_2.1.7.bb (renamed from meta-oe/recipes-support/udisks/udisks2_2.1.5.bb)8
2 files changed, 31 insertions, 3 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 @@
+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
+
+ /**
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb
index f365cfaaf5..34762ddc65 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb
@@ -7,9 +7,11 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
RDEPENDS_${PN} = "acl"
-SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2"
-SRC_URI[md5sum] = "73632501002e6de8244f831e38b2b98e"
-SRC_URI[sha256sum] = "2cfcf560447ea44cba2a683342c7062aaaf35e4eb554bed64ac2dd55a70a5fb6"
+SRC_URI = "http://udisks.freedesktop.org/releases/udisks-${PV}.tar.bz2 \
+ file://non-gnu-libc.patch \
+"
+SRC_URI[md5sum] = "8bccd36573b75286538bd5bd2c424f45"
+SRC_URI[sha256sum] = "abae2bb3bdc691ca13c1e4c244630b8c881c4f3b35c207299f1b39b7bec83785"
inherit autotools systemd gtk-doc gobject-introspection