From patchwork Thu May 31 14:52:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 923417 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40xVwm1VNkz9s08 for ; Fri, 1 Jun 2018 00:59:19 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 288D1128D; Thu, 31 May 2018 14:52:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 96690151C for ; Thu, 31 May 2018 14:52:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 473C96E8 for ; Thu, 31 May 2018 14:52:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 75887BB41B for ; Thu, 31 May 2018 14:52:51 +0000 (UTC) Received: from graphite.redhat.com (unknown [10.40.205.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00079ED16B for ; Thu, 31 May 2018 14:52:50 +0000 (UTC) From: Timothy Redaelli To: dev@openvswitch.org Date: Thu, 31 May 2018 16:52:41 +0200 Message-Id: <52b9a5d71bf141f24e80b3f1f71888fa6820a7f6.1527705975.git.tredaelli@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 31 May 2018 14:52:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 31 May 2018 14:52:51 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'tredaelli@redhat.com' RCPT:'' X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 2/3] Partially revert "m4: Add hard requirements for python in "configure"" X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This partially reverts commit 7777d53d2f4b84cc77868f2a55d66417fe6058d0. Python2 check for "six.moves.range" is not reverted. Signed-off-by: Timothy Redaelli --- m4/openvswitch.m4 | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) 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],