From 8d6cbb3657bdbf2ad5ef33b8ba51f29747743e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 17 May 2022 17:09:21 +0200 Subject: [PATCH] Python: Use EXT_SUFFIX config var over the deprecated/removed SO Fixes https://gitlab.com/ita1024/waf/-/issues/2386 --- waflib/Tools/python.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py index fb641e5e..a23bd019 100644 --- a/waflib/Tools/python.py +++ b/waflib/Tools/python.py @@ -315,7 +315,7 @@ def check_python_headers(conf, features='pyembed pyext'): conf.fatal('Could not find the python executable') # so we actually do all this for compatibility reasons and for obtaining pyext_PATTERN below - v = 'prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS LDVERSION'.split() + v = 'prefix SO EXT_SUFFIX LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS LDVERSION'.split() try: lst = conf.get_python_variables(["get_config_var('%s') or ''" % x for x in v]) except RuntimeError: @@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): x = 'MACOSX_DEPLOYMENT_TARGET' if dct[x]: env[x] = conf.environ[x] = str(dct[x]) - env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake + env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 # Try to get pythonX.Y-config