summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-02-20 17:27:40 +0100
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-02-20 17:27:40 +0100
commit4d4c63f2db8d1683c89e7e806006f9d8c3877b47 (patch)
treebc968588e531cadd89d5c0a64ec566453344f5d4
parentbb3786088cd521fdcfd6b89fb807b605b0d0fac1 (diff)
downloadpoky-4d4c63f2db8d1683c89e7e806006f9d8c3877b47.tar.gz
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'
-rw-r--r--meta/packages/dbus/dbus-1.0.3/fix-cr-size.patch24
-rw-r--r--meta/packages/dbus/dbus-native_1.0.3.bb3
2 files changed, 26 insertions, 1 deletions
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 @@
1Dbus-native fails to build on few systems:
2
3- Debian 'sid' post-Lenny release
4- Fedora 9
5
6Bug was reported in OE bugtracker: http://bugs.openembedded.net/show_bug.cgi?id=4334
7
8| dbus-sysdeps-unix.c: In function '_dbus_read_credentials_unix_socket':
9| dbus-sysdeps-unix.c:1002: error: storage size of 'cr' isn't known
10| dbus-sysdeps-unix.c:1005: warning: pointer targets in passing argument 5 of 'getsockopt' differ in signedness
11| dbus-sysdeps-unix.c:1002: warning: unused variable 'cr'
12
13diff -urN dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c dbus-1.0.1/dbus/dbus-sysdeps-unix.c
14--- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 03:50:33.000000000 +0200
15+++ dbus-1.0.1/dbus/dbus-sysdeps-unix.c 2009-01-01 04:09:24.000000000 +0200
16@@ -992,7 +992,7 @@
17 _dbus_verbose ("read credentials byte\n");
18
19 {
20-#ifdef SO_PEERCRED
21+#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED)
22 struct ucred cr;
23 int cr_len = sizeof (cr);
24
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"
3LICENSE = "GPL" 3LICENSE = "GPL"
4SECTION = "base" 4SECTION = "base"
5 5
6PR = "r0" 6PR = "r1"
7 7
8DEPENDS = "glib-2.0-native libxml2-native expat-native" 8DEPENDS = "glib-2.0-native libxml2-native expat-native"
9 9
@@ -12,6 +12,7 @@ DEFAULT_PREFERENCE = "-1"
12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}" 12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
14 file://cross.patch;patch=1 \ 14 file://cross.patch;patch=1 \
15 file://fix-cr-size.patch;patch=1 \
15 " 16 "
16 17
17inherit autotools pkgconfig gettext native 18inherit autotools pkgconfig gettext native