| Message ID | 52b9a5d71bf141f24e80b3f1f71888fa6820a7f6.1527705975.git.tredaelli@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Permit to build OVS with only Python3 installed | expand |
On Thu, May 31, 2018 at 04:52:41PM +0200, Timothy Redaelli wrote: > This partially reverts commit 7777d53d2f4b84cc77868f2a55d66417fe6058d0. > > Python2 check for "six.moves.range" is not reverted. > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> Thanks for the patch. The commit message doesn't make it clear to me the reason for the patch. Can you add a sentence or two? Thanks, Ben.
On Thu, Jun 14, 2018 at 01:50:16PM -0700, Ben Pfaff wrote: > On Thu, May 31, 2018 at 04:52:41PM +0200, Timothy Redaelli wrote: > > This partially reverts commit 7777d53d2f4b84cc77868f2a55d66417fe6058d0. > > > > Python2 check for "six.moves.range" is not reverted. > > > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > > Thanks for the patch. > > The commit message doesn't make it clear to me the reason for the > patch. Can you add a sentence or two? I guess this series is still under review, do you want it for 2.10?
On Tue, 10 Jul 2018 14:23:59 -0700 Ben Pfaff <blp@ovn.org> wrote: > On Thu, Jun 14, 2018 at 01:50:16PM -0700, Ben Pfaff wrote: > > On Thu, May 31, 2018 at 04:52:41PM +0200, Timothy Redaelli wrote: > > > This partially reverts commit > > > 7777d53d2f4b84cc77868f2a55d66417fe6058d0. > > > > > > Python2 check for "six.moves.range" is not reverted. > > > > > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > > > > Thanks for the patch. > > > > The commit message doesn't make it clear to me the reason for the > > patch. Can you add a sentence or two? > > I guess this series is still under review, do you want it for 2.10? Hi, I re-sent this patch merged with patch 3 in https://patchwork.ozlabs.org/project/openvswitch/list/?series=51572 It would be great, if possible, to have it for OVS 2.10. Thank you
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 3f301b23b..f05b65c58 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -371,26 +371,22 @@ else: fi done done + if test $ovs_cv_python != no && test -x "$ovs_cv_python"; then + if ! "$ovs_cv_python" -c 'import six ; six.moves.range' >&AS_MESSAGE_LOG_FD 2>&1; then + ovs_cv_python=no + AC_MSG_WARN([Missing Python six library or version too old.]) + fi + fi fi]) - - # Set $PYTHON from cache variable. - if test $ovs_cv_python = no; then - AC_MSG_ERROR([cannot find python 2.7 or higher.]) - fi - AM_MISSING_PROG([PYTHON], [python]) - PYTHON=$ovs_cv_python - - # HAVE_PYTHON is always true. (Python has not always been a build - # requirement, so this variable is now obsolete.) AC_SUBST([HAVE_PYTHON]) - HAVE_PYTHON=yes - AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes]) - - AC_MSG_CHECKING([whether $PYTHON has six library]) - if ! $PYTHON -c 'import six ; six.moves.range' >&AS_MESSAGE_LOG_FD 2>&1; then - AC_MSG_ERROR([Missing Python six library or version too old.]) + AM_MISSING_PROG([PYTHON], [python]) + if test $ovs_cv_python != no; then + PYTHON=$ovs_cv_python + HAVE_PYTHON=yes + else + HAVE_PYTHON=no fi - AC_MSG_RESULT([yes])]) + AM_CONDITIONAL([HAVE_PYTHON], [test "$HAVE_PYTHON" = yes])]) dnl Checks for Python 3.x, x >= 4. AC_DEFUN([OVS_CHECK_PYTHON3],
This partially reverts commit 7777d53d2f4b84cc77868f2a55d66417fe6058d0. Python2 check for "six.moves.range" is not reverted. Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- m4/openvswitch.m4 | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)