[oe-commits] Graham Gower : dbus: fix dbus-daemon segfault on mipsel with recent toolchain

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: dd72daef5fd9b6660e8b9093607b4aea09ec643f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=dd72daef5fd9b6660e8b9093607b4aea09ec643f

Author: Graham Gower <graham.gower at gmail.com>
Date:   Thu Aug  6 15:26:21 2009 +0000

dbus: fix dbus-daemon segfault on mipsel with recent toolchain

dbus-daemon segfaults on mipsel when built with -fPIE/-pie, as outlined in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532821

Removes PIE compilation from the dbus-daemon Makefile as a workaround.

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Acked-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Holger Freyther <zecke at selfish.org>

---

 recipes/dbus/dbus-native_1.0.3.bb |    2 +-
 recipes/dbus/dbus-native_1.2.1.bb |    1 +
 recipes/dbus/dbus.inc             |    6 ++++++
 recipes/dbus/dbus_1.0.3.bb        |    2 +-
 recipes/dbus/dbus_1.2.1.bb        |    2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/recipes/dbus/dbus-native_1.0.3.bb b/recipes/dbus/dbus-native_1.0.3.bb
index 8a4c6fe..6ec0fc8 100644
--- a/recipes/dbus/dbus-native_1.0.3.bb
+++ b/recipes/dbus/dbus-native_1.0.3.bb
@@ -1,6 +1,6 @@
 require dbus.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"
 
 inherit native
diff --git a/recipes/dbus/dbus-native_1.2.1.bb b/recipes/dbus/dbus-native_1.2.1.bb
index 566c7bc..2b1610e 100644
--- a/recipes/dbus/dbus-native_1.2.1.bb
+++ b/recipes/dbus/dbus-native_1.2.1.bb
@@ -1,4 +1,5 @@
 require dbus.inc
+PR = "${INC_PR}.0"
 RRECOMMENDS_${PN} = ""
 RDEPENDS_${PN} = ""
 inherit native
diff --git a/recipes/dbus/dbus.inc b/recipes/dbus/dbus.inc
index 0302cfe..b5eeb08 100644
--- a/recipes/dbus/dbus.inc
+++ b/recipes/dbus/dbus.inc
@@ -4,6 +4,8 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"
 
+INC_PR = "r16"
+
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
@@ -30,6 +32,10 @@ EXTRA_OECONF = "\
   --with-dbus-default-reply-timeout=200000 \
 "
 
+do_compile_prepend_mipsel() {
+	sed -i -e 's/\-fPIE//' -e 's/\-pie\ \-Wl\,\-z\,relro//' bus/Makefile
+}
+
 do_install_append() {
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
diff --git a/recipes/dbus/dbus_1.0.3.bb b/recipes/dbus/dbus_1.0.3.bb
index 2589cfe..7001bb9 100644
--- a/recipes/dbus/dbus_1.0.3.bb
+++ b/recipes/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-PR = "r16"
+PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/dbus/dbus_1.2.1.bb b/recipes/dbus/dbus_1.2.1.bb
index 9d6c4c1..72db1da 100644
--- a/recipes/dbus/dbus_1.2.1.bb
+++ b/recipes/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r12"
+PR = "${INC_PR}.0"