[oe] [PATCH] fix dbus-daemon segfault on mipsel with recent toolchain
Khem Raj
raj.khem at gmail.com
Fri Aug 7 03:01:45 UTC 2009
On (07/08/09 10:56), Graham Gower wrote:
> 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
>
> Signed-off-by: Graham Gower <graham.gower at gmail.com>
looks ok to me.
Acked-by: Khem Raj <raj.khem at gmail.com>
>
> 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"
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
More information about the Openembedded-devel
mailing list