[PATCHES] Generate shorter name for extra python files

Stefan Metzmacher metze at samba.org
Wed Jul 5 13:34:50 UTC 2017


Hi Lukas,

> diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
> index f97439c945b4e986bacef39387cf4168d419e158..bfaf5e6250e0ec17e9d300fc7c839bae769cec1e 100644
> --- a/buildtools/wafsamba/samba_python.py
> +++ b/buildtools/wafsamba/samba_python.py
> @@ -85,10 +85,10 @@ def _check_python_headers(conf, mandatory):
>      if conf.env['PYTHON_VERSION'] > '3':
>          abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
>          conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
> +        conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = conf.env['PYTHON_VERSION']
>      else:
>          conf.env['PYTHON_SO_ABI_FLAG'] = ''
> -    conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
> -        conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
> +        conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ''
>  
>      for lib in conf.env['LINKFLAGS_PYEMBED']:
>          if lib.startswith('-L'):
> @@ -170,7 +170,7 @@ Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
>  
>  def pyembed_libname(bld, name, extrapython=False):
>      if bld.env['PYTHON_SO_ABI_FLAG']:
> -        return name + bld.env['PYTHON_SO_ABI_FLAG']
> +        return name + bld.env['PYTHON_VERSION']
>      else:
>          return name

what is conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] used for?
It's write-only in this patchset.

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20170705/3856fbcc/signature.sig>


More information about the samba-technical mailing list