Browse Source

makewheel: fix location of libpythonX.Y.so on Debian/Ubuntu

rdb 5 years ago
parent
commit
f57cd186bb
1 changed files with 6 additions and 1 deletions
  1. 6 1
      makepanda/makewheel.py

+ 6 - 1
makepanda/makewheel.py

@@ -726,7 +726,12 @@ __version__ = '{0}'
         pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name)
         pylib_path = os.path.join(get_config_var('LIBDIR'), pylib_name)
     else:
     else:
         pylib_name = get_config_var('LDLIBRARY')
         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.write_file('deploy_libs/' + pylib_name, pylib_path)
 
 
     whl.close()
     whl.close()