diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
| commit | f0eb3fa507e436d44b943bedfcd8afa5ff760971 (patch) | |
| tree | 15a57fffc1a01825821f35508fc84ce2a08fd93e /packages/dbus | |
| parent | 51d30ada0db9ff322925628fe9d965687685f52d (diff) | |
| parent | b8a64f32a1bd74900ef43067e40fa1153c5f27cc (diff) | |
merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'
Diffstat (limited to 'packages/dbus')
| -rw-r--r-- | packages/dbus/dbus-c++-native_svn.bb | 15 | ||||
| -rw-r--r-- | packages/dbus/dbus-c++_svn.bb | 8 | ||||
| -rw-r--r-- | packages/dbus/dbus-glib_0.74.bb | 4 |
3 files changed, 19 insertions, 8 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.*" diff --git a/packages/dbus/dbus-glib_0.74.bb b/packages/dbus/dbus-glib_0.74.bb index 3754abb708..0a34c738c3 100644 --- a/packages/dbus/dbus-glib_0.74.bb +++ b/packages/dbus/dbus-glib_0.74.bb @@ -15,8 +15,8 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" do_configure_prepend() { - install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/ - install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ } do_stage () { |