diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2018-02-20 23:17:49 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2018-02-20 23:17:49 +0000 |
| commit | f8a1071d968bbfc7993ae758df93f6a326ef77d6 (patch) | |
| tree | 2fabf740e561c19f0117481a1e3f78a32d90d928 /databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py | |
| parent | Fix RANDOMIZE_MASTER_SITES. (diff) | |
Update supplimentary Samba libs to the latest versions.
Sponsored by: iXsystems Inc.
Diffstat (limited to 'databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py')
| -rw-r--r-- | databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py b/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py index dcea3ffd78c3..429ec5e778f9 100644 --- a/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py +++ b/databases/ldb12/files/patch-buildtools__wafsamba__samba_python.py @@ -1,6 +1,6 @@ ---- buildtools/wafsamba/samba_python.py.orig 2017-04-28 08:57:26 UTC +--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC +++ buildtools/wafsamba/samba_python.py -@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man +@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man def _check_python_headers(conf, mandatory): try: @@ -19,12 +19,16 @@ if conf.env['PYTHON_VERSION'] > '3': - abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0] - conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % '' -+ override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None) -+ if override_PYTHON3_SO_ABI_FLAG is not None: -+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG ++ '''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 % '' |