[PATCHES] Generate shorter name for extra python files
Lukas Slebodnik
lslebodn at redhat.com
Thu Jul 6 10:19:16 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.
>
BTW PYTHON_LIBNAME_SO_ABI_FLAG is used only for extra python
and therefore pkgconfig file is the same for all architectures with python2
armv7hl https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112827
i686 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112802
ppc64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112787
ppc64le https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112771
s390x https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112816
x86_64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112762
aarch64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112772
and different pkgconfig files with extra python (python3.6)
armv7hl https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112825
i686 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112810
ppc64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112783
ppc64le https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112764
s390x https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112819
x86_64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112760
aarch64 https://koji.fedoraproject.org/koji/rpminfo?rpmID=10112777
It will be much simpler with this patchset and there still be unique name
for different version of python
/usr/lib64/libpyldb-util3.6.so
/usr/lib64/pkgconfig/pyldb-util3.6.pc
I assume that packagers on debian will appreciate it as well
because they build packages on more architectures.
LS
More information about the samba-technical
mailing list