diff options
author | Christian Tismer <tismer@stackless.com> | 2015-06-27 01:30:45 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2015-06-27 01:30:45 +0200 |
commit | d3e720d8f23b435026f29ade1f6fce320cc6af04 (patch) | |
tree | f5cd7b5b474dc50fffc2120f929ff8e324ad84dc /setup.py | |
parent | fab3a2f4ea6013f84d58bddbb936d9797e2fa8f9 (diff) |
fix an old installer error with rpath.
This bug is old, but showed up after I tried to build parts of PySide for Qt5.
Problem: There are rpath entries which don't trigger creation of an rpath command.
This can be seen when Qt is not linked, and qtcore has an explicit path.
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -932,10 +932,10 @@ class pyside_build(_build): raise RuntimeError("Error patching rpath in " + srcpath) elif sys.platform == 'darwin': - pyside_libs = [lib for lib in os.listdir(package_path) if filter_match( + pyside_libs = [lib for lib in os.listdir(package_path) if filter_match( lib, ["*.so", "*.dylib"])] - def rpath_cmd(srcpath): - osx_localize_libpaths(srcpath, pyside_libs, None) + def rpath_cmd(srcpath): + osx_localize_libpaths(srcpath, pyside_libs, None) else: raise RuntimeError('Not configured for platform ' + @@ -951,7 +951,7 @@ class pyside_build(_build): if not os.path.exists(srcpath): continue rpath_cmd(srcpath) - print("Patched rpath to '$ORIGIN/' in %s." % (srcpath)) + print("Patched rpath to '$ORIGIN/' (Linux) or updated rpath (OS/X) in %s." % (srcpath)) try: |