From 9d219d80a014a131e8f66cdb73804a5d7d2784ef Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 15 Jul 2013 19:36:39 -0500 Subject: dbus-ptest: Disable python module check Disable the python module check, as the host python modules are not needed for generating the target tests. (From OE-Core rev: 1395a2364aefbe1d19af155e132b6885ec095771) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../dbus/dbus-1.6.10/python-config.patch | 25 ++++++++++++++++++++++ meta/recipes-core/dbus/dbus-ptest_1.6.10.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-core/dbus/dbus-1.6.10/python-config.patch (limited to 'meta/recipes-core/dbus') 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 + +--- 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" -- cgit v1.2.3-54-g00ecf