From 78cdd5ea7ddf265d8143c8d9dc42934889618dd1 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 12 Nov 2014 19:49:45 +0100 Subject: [PATCH] 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 Reviewed-By: Jelmer Vernooij Reviewed-by: Andreas Schneider Autobuild-User(master): Jelmer Vernooij Autobuild-Date(master): Fri Apr 24 04:26:45 CEST 2015 on sn-devel-104 --- buildtools/wafsamba/samba_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.34.1