summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus/python-config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/dbus/dbus/python-config.patch')
-rw-r--r--meta/recipes-core/dbus/dbus/python-config.patch21
1 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch
index 294400247e..da2f10c726 100644
--- a/meta/recipes-core/dbus/dbus/python-config.patch
+++ b/meta/recipes-core/dbus/dbus/python-config.patch
@@ -7,19 +7,28 @@ Upstream-Status: Inappropriate [oe specific]
7 7
8Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 8Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
9 9
10--- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 10---
11+++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 11 configure.ac | 7 -------
12@@ -257,13 +257,6 @@ 12 1 file changed, 7 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 80d27b4..becc1cc 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -279,13 +279,6 @@ if test "x$enable_tests" = xyes; then
13 # full test coverage is required, Python is a hard dependency 19 # full test coverage is required, Python is a hard dependency
14 AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) 20 AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi])
15 AM_PATH_PYTHON([2.6]) 21 AM_PATH_PYTHON([2.6])
16- AC_MSG_CHECKING([for Python modules for full test coverage]) 22- AC_MSG_CHECKING([for Python modules for full test coverage])
17- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then 23- if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then
18- AC_MSG_RESULT([yes]) 24- AC_MSG_RESULT([yes])
19- else 25- else
20- AC_MSG_RESULT([no]) 26- AC_MSG_RESULT([no])
21- AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) 27- AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules])
22- fi 28- fi
23 else 29 else
24 # --enable-tests not given: do not abort if Python is missing 30 # --enable-tests not given: do not abort if Python is missing
25 AM_PATH_PYTHON([2.6], [], [:]) 31 AM_PATH_PYTHON([2.6], [], [:])
32--
331.9.1
34