resolve loader_path

delocate/delocating.py

@@ -199,7 +199,7 @@ def _copy_required(lib_path, copy_filt_func, copied_libs):
     ``dependings_dict`` entry for ``copied_libs['/sys/libB.dylib']``
     """
     # Paths will be prepended with `lib_path`
-    lib_dict = tree_libs(lib_path)
+    lib_dict = tree_libs(lib_path, original_paths=list(copied_libs.keys()))
     # Map library paths after copy ('copied') to path before copy ('orig')
     rp_lp = realpath(lib_path)
     copied2orig = dict((pjoin(rp_lp, basename(c)), c) for c in copied_libs)

delocate/libsana.py

@@ -13,7 +13,7 @@
 from .tmpdirs import TemporaryDirectory
 
 
-def tree_libs(start_path, filt_func=None):
+def tree_libs(start_path, filt_func=None, original_paths=[]):
     """ Return analysis of library dependencies within `start_path`
 
     Parameters
@@ -24,6 +24,8 @@ def tree_libs(start_path, filt_func=None):
         If None, inspect all files for library dependencies. If callable,
         accepts filename as argument, returns True if we should inspect the
         file, False otherwise.
+    original_paths: list
+        A list of the original paths of the libraries copied to ``start_path``.
 
     Returns
     -------
@@ -56,7 +58,16 @@ def tree_libs(start_path, filt_func=None):
             depending_libpath = realpath(pjoin(dirpath, base))
             if filt_func is not None and not filt_func(depending_libpath):
                 continue
-            rpaths = get_rpaths(depending_libpath)
+
+            depending_libpath_orig = depending_libpath
+            for orig_path in original_paths:
+                if os.path.basename(orig_path) == base and \
+                        os.path.isabs(orig_path):
+                    depending_libpath_orig = orig_path
+                    break
+
+            rpaths = get_rpaths(depending_libpath_orig)
+
             search_paths = rpaths + env_var_paths
             for install_name in get_install_names(depending_libpath):
                 # If the library starts with '@rpath' we'll try and resolve it

delocate/tests/test_install_names.py

@@ -141,6 +141,11 @@ def test_add_rpath():
         assert_equal(get_rpaths(libfoo), ('/a/path',))
         add_rpath(libfoo, '/another/path')
         assert_equal(get_rpaths(libfoo), ('/a/path', '/another/path'))
+        add_rpath(libfoo, '@loader_path')
+        assert_equal(get_rpaths(libfoo), ('/a/path', '/another/path', tmpdir))
+        add_rpath(libfoo, '@loader_path/lib')
+        assert_equal(get_rpaths(libfoo), ('/a/path', '/another/path', tmpdir,
+                                          pjoin(tmpdir, 'lib')))
 
 
 def _copy_libs(lib_files, out_path):

delocate/tools.py

@@ -324,7 +324,12 @@ def get_rpaths(filename):
             continue
         cmdsize, path = lines[line_no:line_no+2]
         assert cmdsize.startswith('cmdsize ')
-        paths.append(RPATH_RE.match(path).groups()[0])
+        path = (RPATH_RE.match(path).groups()[0])
+        if path.startswith("@loader_path/"):
+            path = os.path.join(os.path.dirname(filename), path[13:])
+        elif path == "@loader_path":
+            path = os.path.dirname(filename)
+        paths.append(path)
         line_no += 2
     return tuple(paths)