diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-12 10:24:55 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-12 10:24:55 +0000 |
| commit | 669aeb73eb48b7b224b91e5108d8d736d9489cba (patch) | |
| tree | 8314b92075ec8df3e412ddace79fbcc717a292e6 | |
| parent | 1daca591dd32df7e810fe279c75296cac437dfa8 (diff) | |
| download | openembedded-core-669aeb73eb48b7b224b91e5108d8d736d9489cba.tar.gz openembedded-core-669aeb73eb48b7b224b91e5108d8d736d9489cba.tar.bz2 openembedded-core-669aeb73eb48b7b224b91e5108d8d736d9489cba.tar.xz openembedded-core-669aeb73eb48b7b224b91e5108d8d736d9489cba.zip | |
dbus-glib: Use the binding tool from PATH
| -rw-r--r-- | meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch | 19 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-glib-native_0.76.bb | 2 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-glib_0.76.bb | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch new file mode 100644 index 000000000..1bdac5a39 --- /dev/null +++ b/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch @@ -0,0 +1,19 @@ +Use the dbus-binding-tool from PATH, not the generated one. + +RP - 12/1/09 + +Index: dbus-glib-0.76/tools/Makefile.am +=================================================================== +--- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000 ++++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000 +@@ -3,8 +3,8 @@ + 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 ++dbus-glib-bindings.h: dbus-bus-introspect.xml ++ 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 + diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb index f3bd5ab13..fe69b2dfc 100644 --- a/meta/packages/dbus/dbus-glib-native_0.76.bb +++ b/meta/packages/dbus/dbus-glib-native_0.76.bb @@ -3,7 +3,7 @@ inherit native DEPENDS = "glib-2.0-native dbus-native" -PR = "r2" +PR = "r3" SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1" diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.76.bb index 1164e5660..22b882e2f 100644 --- a/meta/packages/dbus/dbus-glib_0.76.bb +++ b/meta/packages/dbus/dbus-glib_0.76.bb @@ -1,8 +1,9 @@ require dbus-glib.inc -PR = "r3" +PR = "r4" do_configure_prepend() { - install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ + cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ } +SRC_URI += "file://native-binding-tool.patch;patch=1" |