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 +++++++++++++++ meta-oe/recipes-support/udisks/udisks2_2.1.5.bb | 35 -------------------- meta-oe/recipes-support/udisks/udisks2_2.1.7.bb | 37 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 meta-oe/recipes-support/udisks/udisks2/non-gnu-libc.patch delete mode 100644 meta-oe/recipes-support/udisks/udisks2_2.1.5.bb create mode 100644 meta-oe/recipes-support/udisks/udisks2_2.1.7.bb (limited to 'meta-oe/recipes-support/udisks') 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 + + /** diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb deleted file mode 100644 index f365cfaaf5..0000000000 --- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "udisks provides dbus interfaces for disks and storage devices" -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" - -DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native" -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" - -inherit autotools systemd gtk-doc gobject-introspection - -S = "${WORKDIR}/udisks-${PV}" - -EXTRA_OECONF = "--disable-man" - -FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ - ${datadir}/dbus-1/ \ - ${datadir}/polkit-1 \ - ${nonarch_base_libdir}/udev/* \ - ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ -" - -PACKAGES =+ "${PN}-libs" - -FILES_${PN} += "${datadir}/bash-completion" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" - -FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb new file mode 100644 index 0000000000..34762ddc65 --- /dev/null +++ b/meta-oe/recipes-support/udisks/udisks2_2.1.7.bb @@ -0,0 +1,37 @@ +SUMMARY = "udisks provides dbus interfaces for disks and storage devices" +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" + +DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +RDEPENDS_${PN} = "acl" + +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 + +S = "${WORKDIR}/udisks-${PV}" + +EXTRA_OECONF = "--disable-man" + +FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ + ${datadir}/dbus-1/ \ + ${datadir}/polkit-1 \ + ${nonarch_base_libdir}/udev/* \ + ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ +" + +PACKAGES =+ "${PN}-libs" + +FILES_${PN} += "${datadir}/bash-completion" +FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" + +FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/udisks2/.debug" + +SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_AUTO_ENABLE = "disable" -- cgit 1.2.3-korg