diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-11-12 19:49:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2015-04-24 04:26:45 +0200 |
| commit | 78cdd5ea7ddf265d8143c8d9dc42934889618dd1 (patch) | |
| tree | fe3074ebbb6028814390f50be5df1af3b39d8739 /buildtools/wafsamba/samba_utils.py | |
| parent | cc491fb080882e36f549fd0a348800431ccb3074 (diff) | |
| download | samba-78cdd5ea7ddf265d8143c8d9dc42934889618dd1.tar.gz | |
buildtools: Use all of pyext_PATTERN in map_shlib_extension
In Python 3, C extension module filenames have an ABI tag;
the pyext_PATTERN is e.g. "%s.cpython-34m.so".
The build system was only using the last dot-separated element
of that extension (the ".so").
Use the whole extension when constructing the final filename.
Signed-off-by: Petr Viktorin <pviktori@redhat.com>
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Fri Apr 24 04:26:45 CEST 2015 on sn-devel-104
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index df4a552dbee..e8bc0f38bc2 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -577,7 +577,7 @@ def map_shlib_extension(ctx, name, python=False): return name (root1, ext1) = os.path.splitext(name) if python: - (root2, ext2) = os.path.splitext(ctx.env.pyext_PATTERN) + return ctx.env.pyext_PATTERN % root1 else: (root2, ext2) = os.path.splitext(ctx.env.shlib_PATTERN) return root1+ext2 |