[oe-commits] org.oe.dev dbus-c++: catch up with SRCREV and make it build again

[mickeyl commit]

dbus-c++: catch up with SRCREV and make it build again

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4202065ccdf53efb3f2e35af2f07d2d55ee0aa27
ViewMTN: http://monotone.openembedded.org/revision/info/4202065ccdf53efb3f2e35af2f07d2d55ee0aa27
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/dbus/dbus-c++-native_svn.bb
packages/dbus/dbus-c++_svn.bb
Diffs:

#
# mt diff -r80f62b02a0d1e41f9471e4686325d8860e717d71 -r4202065ccdf53efb3f2e35af2f07d2d55ee0aa27
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [acd372a44cfe8a4e1e3db38949e45f2a27f5a357]
#    to [8812b78631feb35fcd1a98e4b086786954365f2f]
# 
# patch "packages/dbus/dbus-c++-native_svn.bb"
#  from [7eb2939e91cca228ceb1c6c1bf08fd50acb9a210]
#    to [2687357d87d457007559964f5aa6f9cab8341da3]
# 
# patch "packages/dbus/dbus-c++_svn.bb"
#  from [8b99926fdfa9bd562bdceaf341c89352f338d839]
#    to [7b9016b6a0003a62f07983fb64cf288c46a87c17]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	acd372a44cfe8a4e1e3db38949e45f2a27f5a357
+++ conf/distro/include/sane-srcrevs.inc	8812b78631feb35fcd1a98e4b086786954365f2f
@@ -9,6 +9,8 @@ SRCREV_pn-bfin-uclibc ?= "1857"
 
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-dbus-c++-native ?= "13131"
+SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
 SRCREV_pn-eglibc ?= "3531"
============================================================
--- packages/dbus/dbus-c++-native_svn.bb	7eb2939e91cca228ceb1c6c1bf08fd50acb9a210
+++ packages/dbus/dbus-c++-native_svn.bb	2687357d87d457007559964f5aa6f9cab8341da3
@@ -1,6 +1,21 @@ DEPENDS = ""
 require dbus-c++_${PV}.bb
 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() {
+	:
+}
+
============================================================
--- packages/dbus/dbus-c++_svn.bb	8b99926fdfa9bd562bdceaf341c89352f338d839
+++ packages/dbus/dbus-c++_svn.bb	7b9016b6a0003a62f07983fb64cf288c46a87c17
@@ -1,10 +1,10 @@ DEPENDS = "dbus dbus-c++-native expat"
 DESCRIPTION = "C++ bindings for dbus"
 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.*"