diff --git a/finance/quickfix/Makefile b/finance/quickfix/Makefile index f92ba6ae71..b662fff5cc 100644 --- a/finance/quickfix/Makefile +++ b/finance/quickfix/Makefile @@ -34,8 +34,8 @@ PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= postgresql MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql -PYTHON_USES= python:2.7 -PYTHON_CONFIGURE_WITH= python2 +PYTHON_USES= python:3.7 +PYTHON_CONFIGURE_WITH= python3 RUBY_USE= ruby=yes RUBY_CONFIGURE_WITH= ruby RUBY_LIB_DEPENDS+=libunwind.so:devel/libunwind diff --git a/finance/quickfix/files/patch-m4_ax__python.m4 b/finance/quickfix/files/patch-m4_ax__python.m4 index 8e3dbc3976..fc05db7d7d 100644 --- a/finance/quickfix/files/patch-m4_ax__python.m4 +++ b/finance/quickfix/files/patch-m4_ax__python.m4 @@ -1,43 +1,15 @@ ---- m4/ax_python.m4.orig 2018-04-16 02:40:31 UTC +--- m4/ax_python.m4.orig 2020-12-08 00:07:54 UTC +++ m4/ax_python.m4 -@@ -18,10 +18,13 @@ AC_ARG_WITH(python2, - has_python3=false - AC_ARG_WITH(python3, - [ --with-python3 will use $PYTHON to find python], -- [ -+ [if test $withval == "no" -+ then -+ has_python3=false -+ else - has_python=true - has_python3=true -- ], -+ fi], - has_python3=false - ) - -@@ -44,20 +47,20 @@ AC_SUBST(PYTHON3_PREFIX) - - if test $has_python2 = true - then -- PYTHON2_INCLUDE_PATH=[`python2 -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`] -+ PYTHON2_INCLUDE_PATH=[`python2.7 -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`] - PYTHON2_CFLAGS="-I${PYTHON2_INCLUDE_PATH}" - AC_SUBST(PYTHON2_CFLAGS) -- PYTHON2_SITE_PACKAGES=[`python2 -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`] -+ PYTHON2_SITE_PACKAGES=[`python2.7 -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`] - AC_SUBST(PYTHON2_SITE_PACKAGES) - AC_DEFINE(HAVE_PYTHON2, 1, Define if you have python2) - fi +@@ -54,10 +54,10 @@ fi if test $has_python3 = true then - PYTHON3_INCLUDE_PATH=[`python3 -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`] -+ PYTHON3_INCLUDE_PATH=[`python3.6 -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`] ++ PYTHON3_INCLUDE_PATH=[`python3.7 -c 'from distutils import sysconfig; print( sysconfig.get_python_inc(1) )'`] PYTHON3_CFLAGS="-I${PYTHON3_INCLUDE_PATH}" AC_SUBST(PYTHON3_CFLAGS) - PYTHON3_SITE_PACKAGES=[`python3 -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`] -+ PYTHON3_SITE_PACKAGES=[`python3.6 -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`] ++ PYTHON3_SITE_PACKAGES=[`python3.7 -c 'from distutils import sysconfig; print( sysconfig.get_python_lib(1) )'`] AC_SUBST(PYTHON3_SITE_PACKAGES) AC_DEFINE(HAVE_PYTHON3, 1, Define if you have python3) fi