| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001 | 
|  | 2 | From: Mingli Yu <mingli.yu@windriver.com> | 
|  | 3 | Date: Fri, 14 Feb 2020 08:19:54 +0000 | 
|  | 4 | Subject: [PATCH] configure.ac: make ndiff depend on python3 | 
|  | 5 |  | 
|  | 6 | Python 2 ceased being maintained on the 1st January 2020. | 
|  | 7 | We've already removed all users of it from oe-core, so | 
|  | 8 | let ndiff depend on python3. | 
|  | 9 |  | 
|  | 10 | Upstream-Status: Pending | 
|  | 11 |  | 
|  | 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 
|  | 13 | --- | 
|  | 14 | .../nmap/7.80-r0/nmap-7.80/configure.ac               | 11 ++++++++--- | 
|  | 15 | 1 file changed, 8 insertions(+), 3 deletions(-) | 
|  | 16 |  | 
|  | 17 | diff --git a/configure.ac b/configure.ac | 
|  | 18 | index 9d2fff8..5ffdd55 100644 | 
|  | 19 | --- a/configure.ac | 
|  | 20 | +++ b/configure.ac | 
|  | 21 | @@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then | 
|  | 22 | HAVE_PYTHON2=true | 
|  | 23 | fi | 
|  | 24 |  | 
|  | 25 | +HAVE_PYTHON3=false | 
|  | 26 | +if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then | 
|  | 27 | +    HAVE_PYTHON3=true | 
|  | 28 | +fi | 
|  | 29 | + | 
|  | 30 | NDIFFDIR=ndiff | 
|  | 31 |  | 
|  | 32 | # Do they want Ndiff? | 
|  | 33 | AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check]) | 
|  | 34 | -if $HAVE_PYTHON2 ; then : ; | 
|  | 35 | +if $HAVE_PYTHON3 ; then : ; | 
|  | 36 | else | 
|  | 37 | if test "$with_ndiff" = "check" ; then | 
|  | 38 | -    AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found]) | 
|  | 39 | +    AC_MSG_WARN([Not building Ndiff because Python3 was not found]) | 
|  | 40 | elif test "$with_ndiff" = "yes"; then | 
|  | 41 | -    AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4]) | 
|  | 42 | +    AC_MSG_FAILURE([--with-ndiff requires Python3]) | 
|  | 43 | fi | 
|  | 44 | with_ndiff=no | 
|  | 45 | fi | 
|  | 46 | -- | 
|  | 47 | 2.24.1 | 
|  | 48 |  |