diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2013-07-15 19:36:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-18 21:23:44 +0100 |
commit | 9d219d80a014a131e8f66cdb73804a5d7d2784ef (patch) | |
tree | 0d92552093e24c697343e4dccbd7de4c58dff9b7 /meta/recipes-core | |
parent | fb58029ed04c105a80a7ca0ed4a18d5ac924742a (diff) | |
download | poky-9d219d80a014a131e8f66cdb73804a5d7d2784ef.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.
(From OE-Core rev: 1395a2364aefbe1d19af155e132b6885ec095771)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/dbus/dbus-1.6.10/python-config.patch | 25 | ||||
-rw-r--r-- | meta/recipes-core/dbus/dbus-ptest_1.6.10.bb | 1 |
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 @@ | |||
1 | When building the dbus-ptest package, we have to enable python. However | ||
2 | checking if the host-system python has the necessary library isn't useful. | ||
3 | |||
4 | Disable the python module check for cross compiling. | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe specific] | ||
7 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
9 | |||
10 | --- dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 | ||
11 | +++ dbus-1.6.8/configure.ac 2013-07-11 14:14:40.969554848 -0500 | ||
12 | @@ -257,13 +257,6 @@ | ||
13 | # 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]) | ||
15 | AM_PATH_PYTHON([2.6]) | ||
16 | - AC_MSG_CHECKING([for Python modules for full test coverage]) | ||
17 | - if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then | ||
18 | - AC_MSG_RESULT([yes]) | ||
19 | - else | ||
20 | - AC_MSG_RESULT([no]) | ||
21 | - AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) | ||
22 | - fi | ||
23 | else | ||
24 | # --enable-tests not given: do not abort if Python is missing | ||
25 | 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 \ | |||
14 | file://ptest.patch \ | 14 | file://ptest.patch \ |
15 | file://dbus-1.init \ | 15 | file://dbus-1.init \ |
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | file://python-config.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630" | 20 | SRC_URI[md5sum] = "de4970c20629aeb958a12132415b3630" |