From 4d4c63f2db8d1683c89e7e806006f9d8c3877b47 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 20 Feb 2009 17:27:40 +0100 Subject: dbus-native: fix build on few systems (error: storage size of 'cr' isn't known) Bug was reported in OE bugtracker: http://bugs.openembedded.net/show_bug.cgi?id=4334 | dbus-sysdeps-unix.c: In function '_dbus_read_credentials_unix_socket': | dbus-sysdeps-unix.c:1002: error: storage size of 'cr' isn't known | dbus-sysdeps-unix.c:1005: warning: pointer targets in passing argument 5 of 'getsockopt' differ in signedness | dbus-sysdeps-unix.c:1002: warning: unused variable 'cr' --- meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch | 24 ++++++++++++++++++++++++ meta/packages/dbus/dbus-native_1.0.3.bb | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch diff --git a/meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch b/meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch new file mode 100644 index 0000000000..dc2c4c45de --- /dev/null +++ b/meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch @@ -0,0 +1,24 @@ +Dbus-native fails to build on few systems: + +- Debian 'sid' post-Lenny release +- Fedora 9 + +Bug was reported in OE bugtracker: http://bugs.openembedded.net/show_bug.cgi?id=4334 + +| dbus-sysdeps-unix.c: In function '_dbus_read_credentials_unix_socket': +| dbus-sysdeps-unix.c:1002: error: storage size of 'cr' isn't known +| dbus-sysdeps-unix.c:1005: warning: pointer targets in passing argument 5 of 'getsockopt' differ in signedness +| dbus-sysdeps-unix.c:1002: warning: unused variable 'cr' + +diff -urN dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c dbus-1.0.1/dbus/dbus-sysdeps-unix.c +--- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 03:50:33.000000000 +0200 ++++ dbus-1.0.1/dbus/dbus-sysdeps-unix.c 2009-01-01 04:09:24.000000000 +0200 +@@ -992,7 +992,7 @@ + _dbus_verbose ("read credentials byte\n"); + + { +-#ifdef SO_PEERCRED ++#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED) + struct ucred cr; + int cr_len = sizeof (cr); + diff --git a/meta/packages/dbus/dbus-native_1.0.3.bb b/meta/packages/dbus/dbus-native_1.0.3.bb index 55889a1a8b..5d13e3f3be 100644 --- a/meta/packages/dbus/dbus-native_1.0.3.bb +++ b/meta/packages/dbus/dbus-native_1.0.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" LICENSE = "GPL" SECTION = "base" -PR = "r0" +PR = "r1" DEPENDS = "glib-2.0-native libxml2-native expat-native" @@ -12,6 +12,7 @@ DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ + file://fix-cr-size.patch;patch=1 \ " inherit autotools pkgconfig gettext native -- cgit v1.2.3-54-g00ecf