sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

lttng-tools: move to Python 3 

(From OE-Core rev: e0cd0bd7da24b7e68e57feb448926ea9b0007590)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin 2016-06-02 12:26:02 +03:00 committed by Richard Purdie
parent 76d6f00b44
commit 8fdb4be2c8
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch
View File

@ -1,30 +0,0 @@
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 4 Dec 2015 16:11:41 +0000
Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings"
Organization: O.S. Systems Software LTDA.
This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 4dee4b4..6608bcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes])
if test "x${enable_python_binding:-yes}" = xyes; then
AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ])
- AM_PATH_PYTHON([3.0])
+ AM_PATH_PYTHON
AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config])
AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config])
--
2.1.4

7
meta/recipes-kernel/lttng/lttng-tools_git.bb
View File

@ -18,16 +18,15 @@ PV = "2.7.1+git${SRCPV}"
PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \
PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \
PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \
"
PACKAGECONFIG ??= "lttng-ust"
PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native"
PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native"
PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
PACKAGECONFIG_remove_libc-musl = "lttng-ust"
SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \
file://stop-using-SIGUNUSED.patch \
file://runtest-2.4.0.patch \
file://0001-lttng-tools-filter-random-filename-of-tests-output.patch \
@ -35,7 +34,7 @@ SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \
S = "${WORKDIR}/git"
inherit autotools-brokensep ptest pkgconfig useradd python-dir
inherit autotools-brokensep ptest pkgconfig useradd python3-dir
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "tracing"