Browse Source

deploy-ng: Fix for missing modules when building on Ubuntu (and probably other distros)

Ubuntu has different builtins than manylinux1, and we need to make sure
we still copy shared objects when the host marks a module as builtin and
manylinux1 has an so for the module.
Mitchell Stokes 8 years ago
parent
commit
f374c0bc4a
1 changed files with 5 additions and 0 deletions
  1. 5 0
      direct/src/showutil/dist.py

+ 5 - 0
direct/src/showutil/dist.py

@@ -169,7 +169,12 @@ class build_apps(distutils.core.Command):
                     whl_modules_ext = '.'.join(whl_modules[0].split('.')[1:])
                 whl_modules = [i.split('.')[0] for i in whl_modules]
 
+            # Make sure to copy any builtins that have shared objects in the deploy libs
+            for mod in freezer_modules:
+                if mod in whl_modules:
+                    freezer_extras.add((mod, None))
 
+            # Copy any shared objects we need
             for module, source_path in freezer_extras:
                 if source_path is not None:
                     # Rename panda3d/core.pyd to panda3d.core.pyd