From 3a206ed7c463e00926c73c2f18a97c6d5d89b86c Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 17 Sep 2018 17:58:01 +0200 Subject: [PATCH] makewheel: ignore dependencies of panda3d_tools/pstats --- makepanda/makewheel.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py index 4931dc1094..2f4680ae69 100644 --- a/makepanda/makewheel.py +++ b/makepanda/makewheel.py @@ -107,6 +107,11 @@ MANYLINUX_LIBS = [ "linux-vdso.so.1", "linux-gate.so.1", "ld-linux.so.2", ] +# Binaries to never scan for dependencies on non-Windows systems. +IGNORE_UNIX_DEPS_OF = [ + "panda3d_tools/pstats", +] + WHEEL_DATA = """Wheel-Version: 1.0 Generator: makepanda Root-Is-Purelib: false @@ -328,11 +333,16 @@ class WheelFile(object): # If this is a .so file, we should set the rpath appropriately. temp = None - ext = os.path.splitext(source_path)[1] + basename, ext = os.path.splitext(source_path) if ext in ('.so', '.dylib') or '.so.' in os.path.basename(source_path) or \ (not ext and is_executable(source_path)): + # Scan and add Unix dependencies. - deps = scan_dependencies(source_path) + if target_path not in IGNORE_UNIX_DEPS_OF: + deps = scan_dependencies(source_path) + else: + deps = [] + for dep in deps: # Only include dependencies with relative path. Otherwise we # end up overwriting system files like /lib/ld-linux.so.2!