From 8177e539f7b950c1b9c114102a43531ff4b7b381 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Sun, 20 Sep 2020 18:03:41 +0100 Subject: [PATCH] cython3 https://github.com/seccomp/libseccomp/pull/188 From 8d09eb9314ad00aa0584345ae66d4419b38da8e0 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 13 Nov 2019 20:54:25 -0500 Subject: [PATCH] build: try to use explicitly marked Python 3.x tools first Python 2.x is going EOL very soon, so let's require Python 3.x now and attempt to use the explicitly marked Python 3.x tools first. Signed-off-by: Paul Moore Gbp-Pq: Name cython3.patch --- configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 2ce2188..addda88 100644 --- a/configure.ac +++ b/configure.ac @@ -91,11 +91,11 @@ AC_SUBST([VERSION_MICRO]) dnl #### dnl cython checks dnl #### -AC_CHECK_PROG(have_cython, cython, "yes", "no") -AS_IF([test "$have_cython" = yes], [ - AS_ECHO("checking cython version... $(cython -V 2>&1 | cut -d' ' -f 3)") - CYTHON_VER_MAJ=$(cython -V 2>&1 | cut -d' ' -f 3 | cut -d'.' -f 1); - CYTHON_VER_MIN=$(cython -V 2>&1 | cut -d' ' -f 3 | cut -d'.' -f 2); +AC_CHECK_PROGS(cython, cython3 cython, "no") +AS_IF([test "$cython" != no], [ + AS_ECHO("checking cython version... $($cython -V 2>&1 | cut -d' ' -f 3)") + CYTHON_VER_MAJ=$($cython -V 2>&1 | cut -d' ' -f 3 | cut -d'.' -f 1); + CYTHON_VER_MIN=$($cython -V 2>&1 | cut -d' ' -f 3 | cut -d'.' -f 2); ],[ CYTHON_VER_MAJ=0 CYTHON_VER_MIN=0 @@ -112,7 +112,7 @@ AS_IF([test "$enable_python" = yes], [ AS_IF([test "$CYTHON_VER_MAJ" -eq 0 -a "$CYTHON_VER_MIN" -lt 29], [ AC_MSG_ERROR([python bindings require cython 0.29 or higher]) ]) - AM_PATH_PYTHON + AM_PATH_PYTHON([3]) ]) AM_CONDITIONAL([ENABLE_PYTHON], [test "$enable_python" = yes]) AC_DEFINE_UNQUOTED([ENABLE_PYTHON], -- 2.30.2