fix dbus-daemon segfault on mipsel with recent toolchain
PATCH 1/1 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.
-Graham
recipes/dbus/dbus-native_1.0.3.bb +0 -0
@@ -1,6 +1,6 @@
require dbus.inc
-PR = "r1"
+PR = "${INC_PR}.0"DEFAULT_PREFERENCE = "-1"
inherit native
recipes/dbus/dbus-native_1.2.1.bb +0 -0
@@ -1,4 +1,5 @@
require dbus.inc
+PR = "${INC_PR}.0"
RRECOMMENDS_${PN} = ""
RDEPENDS_${PN} = ""
inherit native
recipes/dbus/dbus.inc +0 -0
@@ -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-1recipes/dbus/dbus_1.0.3.bb +0 -0
@@ -1,4 +1,4 @@
require dbus.inc
-PR = "r16"
+PR = "${INC_PR}.0"
DEFAULT_PREFERENCE = "-1"
recipes/dbus/dbus_1.2.1.bb +0 -0
@@ -1,3 +1,3 @@
include dbus.inc
-PR = "r12"
+PR = "${INC_PR}.0"
Quoted 8 lines · Graham Gower
dbus-daemon segfaults on mipsel when built with -fPIE/-pie, as outlined in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532821Removes PIE compilation from the dbus-daemon
Makefileas a workaround.-Graham
Signed-off-by Graham Gower <[email protected]>
looks ok to me.
Quoted 71 lines
recipes/dbus/dbus-native_1.0.3.bb +0
-0@@ -1,6 +1,6 @@require dbus.inc
recipes/dbus/dbus-native_1.0.3.bb +1
-1-PR = "r1" +PR = "${INC_PR}.0"
DEFAULT_PREFERENCE= "-1"inherit native
recipes/dbus/dbus-native_1.2.1.bb +0
-0@@ -1,4 +1,5 @@require dbus.inc
+PR = "${INC_PR}.0"
RRECOMMENDS_${PN} = ""
RDEPENDS_${PN} = ""
inherit nativerecipes/dbus/dbus.inc +0
-0@@ -4,6 +4,8 @@ SECTION = "base"LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl libsm libice virtual/libx11"recipes/dbus/dbus.inc +2
-0+INC_PR = "r16" +
SRC_URI= "\
http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \recipes/dbus/dbus.inc +0
-0@@ -30,6 +32,10 @@ EXTRA_OECONF = "\ --with-dbus-default-reply-timeout=200000 \"
recipes/dbus/dbus.inc +4
-0+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-1recipes/dbus/dbus_1.0.3.bb +0
-0@@ -1,4 +1,4 @@require dbus.inc
recipes/dbus/dbus_1.0.3.bb +1
-1-PR = "r16" +PR = "${INC_PR}.0"
DEFAULT_PREFERENCE= "-1"recipes/dbus/dbus_1.2.1.bb +0
-0@@ -1,3 +1,3 @@include dbus.inc
recipes/dbus/dbus_1.2.1.bb +1
-1-PR = "r12" +PR = "${INC_PR}.0"_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel