[PATCHES] Generate shorter name for extra python files
Lukas Slebodnik
lslebodn at redhat.com
Wed Jul 5 13:43:05 UTC 2017
On (05/07/17 15:34), Stefan Metzmacher via samba-technical wrote:
>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.
>
It is used for generating different name libraries used in python bindings.
And therefore it is also in pkgconfig files
sh$ git grep -n PYTHON_LIBNAME_SO_ABI_FLAG
buildtools/wafsamba/samba_python.py:88: conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = conf.env['PYTHON_VERSION']
buildtools/wafsamba/samba_python.py:91: conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = ''
lib/ldb/pyldb-util.pc.in:11:Libs: @LIB_RPATH@ -L${libdir} -lpyldb-util at PYTHON_LIBNAME_SO_ABI_FLAG@
lib/talloc/pytalloc-util.pc.in:9:Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util at PYTHON_LIBNAME_SO_ABI_FLAG@
BTW I added author(s) to CC because I would like to know their opinions.
LS
More information about the samba-technical
mailing list