diff options
| author |   Bernhard Guillon <Bernhard.Guillon@hale.at> | 2011-08-30 20:21:53 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-09-04 09:20:12 +0200 |
| commit | 08513a79f6a54201b38a0c5ee6c086a7cff15dde (patch) | |
| tree | 939d47acdb26b07e4c4c3b7b6652bfea54fbbdee /meta-oe/recipes-core/dbus | |
| parent | 9a9bc6e47dbbab9f405299e4331f1f04f72a5697 (diff) | |
| download | meta-openembedded-contrib-08513a79f6a54201b38a0c5ee6c086a7cff15dde.tar.gz | |
dbus-c++: use openembedded-core versions
Remove non working recipes because openembedded-core provides better
ones.
Signed-off-by: Bernhard Guillon <Bernhard.Guillon@hale.at>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core/dbus')
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-c++-native_git.bb | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch | 13 | ||||
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-c++_git.bb | 23 |
3 files changed, 0 insertions, 53 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-c++-native_git.bb b/meta-oe/recipes-core/dbus/dbus-c++-native_git.bb deleted file mode 100644 index eba80b2e9a..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-c++-native_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -require dbus-c++_git.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_install() { - : -} - diff --git a/meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch b/meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch deleted file mode 100644 index 822216916b..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-c++/fix-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus/tools/Makefile.am -=================================================================== ---- dbus.orig/tools/Makefile.am -+++ dbus/tools/Makefile.am -@@ -16,7 +16,7 @@ endif - bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect - - dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp --dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -+dbusxx_xml2cpp_LDADD = $(libdbus_cxx_la) -lexpat - - dbusxx_introspect_SOURCES = introspect.h introspect.cpp - dbusxx_introspect_LDADD = $(libdbus_cxx_la) diff --git a/meta-oe/recipes-core/dbus/dbus-c++_git.bb b/meta-oe/recipes-core/dbus/dbus-c++_git.bb deleted file mode 100644 index 64598238da..0000000000 --- a/meta-oe/recipes-core/dbus/dbus-c++_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "C++ bindings for dbus" -LICENSE = "LGPLv2.1+" -SECTION = "libs" -DEPENDS = "dbus dbus-c++-native expat" -SRCREV = "530a887913d3b0dd7091eabb8eef8e3c279e3bb8" - -PE = "1" -PV = "0.5.0+gitr${SRCPV}" - -SRC_URI = "git://gitorious.org/dbus-cplusplus/mainline.git;protocol=git" -# file://fix-linking.patch" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -do_compile_prepend() { - find . -name "Makefile.am" |xargs sed -i -e 's,$(top_builddir)/tools/dbusxx-xml2cpp,dbusxx-xml2cpp,' -} - -FILES_${PN}-dbg += "${bindir}/dbusxx-xml2cpp ${bindir}/dbusxx-introspect" -FILES_${PN}-dev += "${bindir}/.dev" -FILES_${PN} = "${libdir}/*.so.*" - |