diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-12-18 16:20:04 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 17:06:58 +0000 |
| commit | 0289a1c325eea881ce3d68def5262f9e763d4fd2 (patch) | |
| tree | def866ff767bbbd88e7ee771d95df5c5eddd71ba /meta/recipes-core/dbus/dbus/python-config.patch | |
| parent | b117403423f700eb4cc6967b9fb8ff3e2858e279 (diff) | |
| download | openembedded-core-contrib-0289a1c325eea881ce3d68def5262f9e763d4fd2.tar.gz | |
dbus: upgrade to 1.6.18
Drop PR and INC_PR.
Move patches into a non-versioned directory, and update dbus-ptest to match.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus/python-config.patch')
| -rw-r--r-- | meta/recipes-core/dbus/dbus/python-config.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch new file mode 100644 index 0000000000..294400247e --- /dev/null +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -0,0 +1,25 @@ +When building the dbus-ptest package, we have to enable python. However +checking if the host-system python has the necessary library isn't useful. + +Disable the python module check for cross compiling. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +--- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 ++++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 +@@ -257,13 +257,6 @@ + # full test coverage is required, Python is a hard dependency + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AM_PATH_PYTHON([2.6]) +- AC_MSG_CHECKING([for Python modules for full test coverage]) +- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) +- fi + else + # --enable-tests not given: do not abort if Python is missing + AM_PATH_PYTHON([2.6], [], [:]) |