mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
dbus-native: Generate the dbus-bus-introspect.xml so dbus-glib recipes don't have to find the dbus source. Pass the location of the file to dbus-glib* with the --with-introspect and drop the now unneeded patch
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
Index: dbus-glib-0.73/tools/Makefile.am
|
||||
===================================================================
|
||||
--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200
|
||||
+++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200
|
||||
@@ -3,9 +3,6 @@
|
||||
nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
|
||||
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
|
||||
|
||||
-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
|
||||
- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
|
||||
-
|
||||
BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
|
||||
|
||||
if USE_INTROSPECT_XML
|
||||
@@ -1,5 +1,5 @@
|
||||
SECTION = "base"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
|
||||
DESCRIPTION = "message bus system for applications to talk to one another"
|
||||
LICENSE = "GPL"
|
||||
@@ -11,9 +11,10 @@ inherit autotools pkgconfig gettext native
|
||||
|
||||
DEPENDS = "glib-2.0-native dbus-native"
|
||||
|
||||
EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
|
||||
|
||||
do_stage() {
|
||||
oe_runmake install
|
||||
install -d ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
|
||||
}
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
SECTION = "base"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
|
||||
DESCRIPTION = "message bus system for applications to talk to one another"
|
||||
LICENSE = "GPL"
|
||||
DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
|
||||
|
||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
|
||||
file://no-examples.patch;patch=1 \
|
||||
file://no-introspect.patch;patch=1"
|
||||
file://no-examples.patch;patch=1"
|
||||
|
||||
inherit autotools pkgconfig gettext
|
||||
|
||||
EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
|
||||
|
||||
FILES_${PN} = "${libdir}/lib*.so.*"
|
||||
FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
|
||||
|
||||
do_configure_prepend() {
|
||||
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/
|
||||
}
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@ inherit native
|
||||
|
||||
DEPENDS = "glib-2.0-native libxml2-native expat-native"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
do_stage() {
|
||||
oe_runmake install
|
||||
autotools_stage_all
|
||||
@@ -10,6 +12,11 @@ do_stage() {
|
||||
# for dbus-glib-native introspection generation
|
||||
install -d ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
|
||||
|
||||
# dbus-glib-native and dbus-glib need this xml file
|
||||
install -d ${STAGING_DATADIR_NATIVE}/dbus/
|
||||
cd ${S}
|
||||
./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
||||
Reference in New Issue
Block a user