From f57cd186bb0bc33e8ac7ec129ba6e8a80650eb9a Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 23 Feb 2020 10:20:38 +0100 Subject: [PATCH] makewheel: fix location of libpythonX.Y.so on Debian/Ubuntu --- makepanda/makewheel.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py index f4fce36de4..51948386b1 100644 --- a/makepanda/makewheel.py +++ b/makepanda/makewheel.py @@ -726,7 +726,12 @@ __version__ = '{0}' pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name) else: pylib_name = get_config_var('LDLIBRARY') - pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name) + pylib_arch = get_config_var('MULTIARCH') + libdir = get_config_var('LIBDIR') + if pylib_arch and os.path.exists(os.path.join(libdir, pylib_arch, pylib_name)): + pylib_path = os.path.join(libdir, pylib_arch, pylib_name) + else: + pylib_path = os.path.join(libdir, pylib_name) whl.write_file('deploy_libs/' + pylib_name, pylib_path) whl.close()