summaryrefslogtreecommitdiff
path: root/packages/dbus
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-10-30 03:32:15 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-10-30 03:32:15 +0000
commit7d018d0bb935efcb9c57550b312377b8a6d297e2 (patch)
treea4cb1ca324da3118e128b3349c399d112a24cb6d /packages/dbus
parent113d446f1e5db3da857162e1ee082f04379023f9 (diff)
parentc13a99e7e044586ac00355d858203fb50ca4838a (diff)
merge of '1eca501d99b909ff783490fdac2b315cd05f4315'
and '4202065ccdf53efb3f2e35af2f07d2d55ee0aa27'
Diffstat (limited to 'packages/dbus')
-rw-r--r--packages/dbus/dbus-c++-native_svn.bb15
-rw-r--r--packages/dbus/dbus-c++_svn.bb8
2 files changed, 17 insertions, 6 deletions
diff --git a/packages/dbus/dbus-c++-native_svn.bb b/packages/dbus/dbus-c++-native_svn.bb
index 96eb2f3227..5599aeb1d2 100644
--- a/packages/dbus/dbus-c++-native_svn.bb
+++ b/packages/dbus/dbus-c++-native_svn.bb
@@ -4,3 +4,18 @@ inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-c++"
# actually dbus-native and expat-native, but even the bearest build machine should have that nowadays...
DEPENDS = ""
+
+do_compile() {
+ oe_runmake -C src libdbus-c++-1.la
+ oe_runmake -C tools dbusxx-xml2cpp
+ install -m 0755 tools/dbusxx-xml2cpp ${STAGING_BINDIR_NATIVE}
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+do_install() {
+ :
+}
+
diff --git a/packages/dbus/dbus-c++_svn.bb b/packages/dbus/dbus-c++_svn.bb
index ea6c0fa8ea..5be58741dc 100644
--- a/packages/dbus/dbus-c++_svn.bb
+++ b/packages/dbus/dbus-c++_svn.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPL"
SECTION = "libs"
DEPENDS = "dbus dbus-c++-native expat"
-SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http \
- file://fix-linking.patch;patch=1"
+SRC_URI = "svn://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs;module=dbus;proto=http"
+# file://fix-linking.patch;patch=1"
S = "${WORKDIR}/dbus"
inherit autotools pkgconfig
@@ -13,10 +13,6 @@ do_compile_prepend() {
find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,'
}
-do_stage() {
- autotools_stage_all
-}
-
FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect"
FILES_${PN}-dev += "${bindir}/.dev"
FILES_${PN} = "${libdir}/*.so.*"