diff options
Diffstat (limited to 'databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py')
| -rw-r--r-- | databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py b/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py deleted file mode 100644 index 429ec5e778f9..000000000000 --- a/databases/ldb14/files/patch-buildtools__wafsamba__samba_python.py +++ /dev/null @@ -1,40 +0,0 @@ ---- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC -+++ buildtools/wafsamba/samba_python.py -@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man - - def _check_python_headers(conf, mandatory): - try: -+ from python import _get_python_variables - Configure.ConfigurationError - conf.check_python_headers(mandatory=mandatory) -+ conf.env['PYTHON_SO_ABI'] = _get_python_variables( -+ conf.env['PYTHON'], -+ ["get_config_var('SOABI') or ''"], -+ ['from distutils.sysconfig import get_config_var'] -+ )[0] - except Configure.ConfigurationError: - if mandatory: - raise - - if conf.env['PYTHON_VERSION'] > '3': -- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' -+ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG, -+ while environment variable is PYTHON3_SO_ABI_FLAG''' -+ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) -+ if override_PYTHON_SO_ABI_FLAG is not None: -+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ if not conf.env['PYTHON_SO_ABI_FLAG']: -+ if conf.env['PYTHON_SO_ABI']: -+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI'] -+ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT']) -+ else: -+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] -+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' - else: - conf.env['PYTHON_SO_ABI_FLAG'] = '' -+ - conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ( - conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-')) - |
