diff options
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch | 30 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-tools_git.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch b/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch new file mode 100644 index 0000000000..d05c04c662 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
2 | Date: Fri, 4 Dec 2015 16:11:41 +0000 | ||
3 | Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings" | ||
4 | Organization: O.S. Systems Software LTDA. | ||
5 | |||
6 | This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
11 | --- | ||
12 | configure.ac | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 4dee4b4..6608bcd 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) | ||
20 | |||
21 | if test "x${enable_python_binding:-yes}" = xyes; then | ||
22 | AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ]) | ||
23 | - AM_PATH_PYTHON([3.0]) | ||
24 | + AM_PATH_PYTHON | ||
25 | |||
26 | AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) | ||
27 | AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) | ||
28 | -- | ||
29 | 2.1.4 | ||
30 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_git.bb index b124b953e6..82a0840ae8 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_git.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_git.bb | |||
@@ -26,6 +26,7 @@ PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" | |||
26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" | 26 | PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" |
27 | 27 | ||
28 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ | 28 | SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ |
29 | file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \ | ||
29 | file://stop-using-SIGUNUSED.patch \ | 30 | file://stop-using-SIGUNUSED.patch \ |
30 | file://runtest-2.4.0.patch \ | 31 | file://runtest-2.4.0.patch \ |
31 | file://run-ptest" | 32 | file://run-ptest" |