summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dbus/dbus-native_1.2.14.bb4
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb4
-rw-r--r--meta/packages/dbus/dbus.inc5
-rw-r--r--meta/packages/dbus/dbus_1.2.14.bb2
-rw-r--r--meta/packages/dbus/dbus_1.2.4.bb2
5 files changed, 12 insertions, 5 deletions
diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index 9e7e049e78..0c6f5815f8 100644
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -3,7 +3,9 @@ inherit native
3 3
4DEPENDS = "glib-2.0-native libxml2-native expat-native" 4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5 5
6PR = "r5" 6PR = "r6"
7
8EXTRA_OECONF_X = "--without-x"
7 9
8do_stage() { 10do_stage() {
9 oe_runmake install 11 oe_runmake install
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 9e7e049e78..0c6f5815f8 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,9 @@ inherit native
3 3
4DEPENDS = "glib-2.0-native libxml2-native expat-native" 4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5 5
6PR = "r5" 6PR = "r6"
7
8EXTRA_OECONF_X = "--without-x"
7 9
8do_stage() { 10do_stage() {
9 oe_runmake install 11 oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index f425f883eb..154db65ba7 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -59,6 +59,8 @@ grep -q netdev: /etc/group || addgroup netdev
59chmod u+s /usr/libexec/dbus-daemon-launch-helper 59chmod u+s /usr/libexec/dbus-daemon-launch-helper
60} 60}
61 61
62EXTRA_OECONF_X = "--with-x"
63
62EXTRA_OECONF = "\ 64EXTRA_OECONF = "\
63 --disable-qt \ 65 --disable-qt \
64 --disable-qt3 \ 66 --disable-qt3 \
@@ -67,8 +69,9 @@ EXTRA_OECONF = "\
67 --disable-checks \ 69 --disable-checks \
68 --disable-xml-docs \ 70 --disable-xml-docs \
69 --disable-doxygen-docs \ 71 --disable-doxygen-docs \
72 --disable-libaudit \
70 --with-xml=expat \ 73 --with-xml=expat \
71 --with-x \ 74 ${EXTRA_OECONF_X} \
72" 75"
73 76
74do_stage() { 77do_stage() {
diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
index 3d4d00bd2f..0d2ed25ecf 100644
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ b/meta/packages/dbus/dbus_1.2.14.bb
@@ -1,5 +1,5 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5inherit update-rc.d 5inherit update-rc.d
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index 3d4d00bd2f..0d2ed25ecf 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,5 +1,5 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r2" 3PR = "r3"
4 4
5inherit update-rc.d 5inherit update-rc.d