summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/dbus/dbus-native_1.0.1.bb5
-rw-r--r--meta/packages/dbus/dbus_1.0.1.bb9
2 files changed, 5 insertions, 9 deletions
diff --git a/meta/packages/dbus/dbus-native_1.0.1.bb b/meta/packages/dbus/dbus-native_1.0.1.bb
index 7e5e4df9dd..1176a56ef6 100644
--- a/meta/packages/dbus/dbus-native_1.0.1.bb
+++ b/meta/packages/dbus/dbus-native_1.0.1.bb
@@ -18,9 +18,8 @@ inherit autotools pkgconfig gettext native
18 18
19S = "${WORKDIR}/dbus-${PV}" 19S = "${WORKDIR}/dbus-${PV}"
20 20
21EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ 21EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
22 --disable-checks --disable-xml-docs --disable-doxygen-docs \ 22 --disable-doxygen-docs --with-xml=expat --without-x"
23 --with-xml=expat --without-x"
24 23
25do_stage () { 24do_stage () {
26 oe_runmake install 25 oe_runmake install
diff --git a/meta/packages/dbus/dbus_1.0.1.bb b/meta/packages/dbus/dbus_1.0.1.bb
index 4b25589435..7a1a8a6ef9 100644
--- a/meta/packages/dbus/dbus_1.0.1.bb
+++ b/meta/packages/dbus/dbus_1.0.1.bb
@@ -8,13 +8,11 @@ DEPENDS = "expat glib-2.0 virtual/libintl"
8 8
9PR = "r1" 9PR = "r1"
10 10
11DEFAULT_PREFERENCE = "-1"
12
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 11SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
14 file://tmpdir.patch;patch=1 \ 12 file://tmpdir.patch;patch=1 \
15 file://dbus-1.init \ 13 file://dbus-1.init \
16 file://fix-segfault.patch;patch=1 \ 14 file://fix-segfault.patch;patch=1 \
17 file://cross.patch;patch=1 \ 15 file://cross.patch;patch=1 \
18 file://fix-install-daemon.patch;patch=1" 16 file://fix-install-daemon.patch;patch=1"
19 17
20inherit autotools pkgconfig update-rc.d gettext 18inherit autotools pkgconfig update-rc.d gettext
@@ -43,9 +41,8 @@ chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
43chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" 41chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
44} 42}
45 43
46EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ 44EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
47 --disable-checks --disable-xml-docs --disable-doxygen-docs \ 45 --disable-doxygen-docs --with-xml=expat --without-x"
48 --with-xml=expat --without-x"
49 46
50do_stage () { 47do_stage () {
51 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} 48 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}