From 9ec533122fdbcfe94dd8cd8442aba7274abad9a3 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 22 Jun 2018 20:04:10 +0200 Subject: Permit to build OVS with only Python3 installed This commit renames HAVE_PYTHON to HAVE_PYTHON2 and PYTHON to PYTHON2 and adds HAVE_PYTHON and PYTHON with a different semantics: - If PYTHON environment variable is set, use it as PYTHON - If a python2 interpreter is available, PYTHON became the python2 interpreter - If a python3 interpreter is available, PYTHON became the python3 interpreter PYTHON is only used to run the python scripts needed by the build system NOTE: Since currently most of the utilities and bugtool doesn't support Python3, they're installed only if python2 is available. This will be fixed in later commits. Signed-off-by: Timothy Redaelli Signed-off-by: Ben Pfaff --- tests/library.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/library.at') diff --git a/tests/library.at b/tests/library.at index 99541b0c9..a30d362e3 100644 --- a/tests/library.at +++ b/tests/library.at @@ -183,7 +183,7 @@ m4_define([UNIX_SOCKET_SHORT_PATHNAME_PYN], AT_CHECK([$3 $srcdir/test-unix-socket.py x]) AT_CLEANUP]) -UNIX_SOCKET_SHORT_PATHNAME_PYN([Python2], [$HAVE_PYTHON], [$PYTHON]) +UNIX_SOCKET_SHORT_PATHNAME_PYN([Python2], [$HAVE_PYTHON2], [$PYTHON2]) UNIX_SOCKET_SHORT_PATHNAME_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3]) dnl Unix sockets with long names are problematic because the name has to @@ -205,7 +205,7 @@ m4_define([UNIX_SOCKET_LONG_PATHNAME_PYN], AT_CHECK([cd $longname && $3 $abs_srcdir/test-unix-socket.py ../$longname/socket socket]) AT_CLEANUP]) -UNIX_SOCKET_LONG_PATHNAME_PYN([Python2], [$HAVE_PYTHON], [$PYTHON]) +UNIX_SOCKET_LONG_PATHNAME_PYN([Python2], [$HAVE_PYTHON2], [$PYTHON2]) UNIX_SOCKET_LONG_PATHNAME_PYN([Python3], [$HAVE_PYTHON3], [$PYTHON3]) AT_SETUP([ovs_assert]) -- cgit v1.2.1