aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-07-15 19:36:39 -0500
committerSaul Wold <sgw@linux.intel.com>2013-07-18 07:14:40 -0700
commit1395a2364aefbe1d19af155e132b6885ec095771 (patch)
treed8d142a0c2b4bdbae18b052e2ab415c1c07cdcf4 /meta/recipes-core/dbus
parent18537025ca8777a45cb24f1d9ee781323695607a (diff)
downloadopenembedded-core-1395a2364aefbe1d19af155e132b6885ec095771.tar.gz
dbus-ptest: Disable python module check
Disable the python module check, as the host python modules are not needed for generating the target tests. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus')
-rw-r--r--meta/recipes-core/dbus/dbus-1.6.10/python-config.patch25
-rw-r--r--meta/recipes-core/dbus/dbus-ptest_1.6.10.bb1
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch b/meta/recipes-core/dbus/dbus-1.6.10/python-config.patch
new file mode 100644
index 0000000000..294400247e
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.6.10/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], [], [:])
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
index 6c0f4040f8..a8e82ef6df 100644
--- a/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
+++ b/meta/recipes-core/dbus/dbus-ptest_1.6.10.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://ptest.patch \
file://dbus-1.init \
file://run-ptest \
+ file://python-config.patch \
"
SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630"