getdeps: adjust fixup-dyn-deps to optionally use absolute paths

Summary:
This commit teaches fixup-dyn-deps how to generate correct
absolute paths in the context of the ultimate install path (specified
via the `--final-install-prefix` option)

Absolute paths are desirable if you have, for example, an executable
that you wish to install with the setuid bit set.

Reviewed By: simpkins

Differential Revision: D17361491

fbshipit-source-id: 4c4f3f15208266300622f84dc9cd1ba83883dfb7

build/fbcode_builder/getdeps/dyndeps.py

@@ -37,14 +37,19 @@ class DepBase(object):
     def interesting_dep(self, d):
         return True
 
+    # final_install_prefix must be the equivalent path to `destdir` on the
+    # installed system.  For example, if destdir is `/tmp/RANDOM/usr/local' which
+    # is intended to map to `/usr/local` in the install image, then
+    # final_install_prefix='/usr/local'.
+    # If left unspecified, destdir will be used.
     def process_deps(self, destdir, final_install_prefix=None):
-        if final_install_prefix is None:
-            final_install_prefix = destdir
-
         if self.buildopts.is_windows():
-            self.munged_lib_dir = os.path.join(final_install_prefix, "bin")
+            lib_dir = "bin"
         else:
-            self.munged_lib_dir = os.path.join(final_install_prefix, "lib")
+            lib_dir = "lib"
+        self.munged_lib_dir = os.path.join(destdir, lib_dir)
+
+        final_lib_dir = os.path.join(final_install_prefix or destdir, lib_dir)
 
         if not os.path.isdir(self.munged_lib_dir):
             os.makedirs(self.munged_lib_dir)
@@ -58,7 +63,7 @@ class DepBase(object):
             src_dir = os.path.join(inst_dir, dir)
             if not os.path.isdir(src_dir):
                 continue
-            dest_dir = os.path.join(final_install_prefix, dir)
+            dest_dir = os.path.join(destdir, dir)
             if not os.path.exists(dest_dir):
                 os.makedirs(dest_dir)
 
@@ -66,9 +71,9 @@ class DepBase(object):
                 print("Consider %s/%s" % (dir, objfile))
                 dest_obj = os.path.join(dest_dir, objfile)
                 copyfile(os.path.join(src_dir, objfile), dest_obj)
-                self.munge_in_place(dest_obj)
+                self.munge_in_place(dest_obj, final_lib_dir)
 
-    def munge_in_place(self, objfile):
+    def munge_in_place(self, objfile, final_lib_dir):
         print("Munging %s" % objfile)
         for d in self.list_dynamic_deps(objfile):
             if not self.interesting_dep(d):
@@ -83,11 +88,11 @@ class DepBase(object):
                 if dep not in self.processed_deps:
                     self.processed_deps.add(dep)
                     copyfile(dep, dest_dep)
-                    self.munge_in_place(dest_dep)
+                    self.munge_in_place(dest_dep, final_lib_dir)
 
-                self.rewrite_dep(objfile, d, dep, dest_dep)
+                self.rewrite_dep(objfile, d, dep, dest_dep, final_lib_dir)
 
-    def rewrite_dep(self, objfile, depname, old_dep, new_dep):
+    def rewrite_dep(self, objfile, depname, old_dep, new_dep, final_lib_dir):
         raise RuntimeError("rewrite_dep not implemented")
 
     def resolve_loader_path(self, dep):
@@ -157,7 +162,7 @@ class WinDeps(DepBase):
 
         return deps
 
-    def rewrite_dep(self, objfile, depname, old_dep, new_dep):
+    def rewrite_dep(self, objfile, depname, old_dep, new_dep, final_lib_dir):
         # We can't rewrite on windows, but we will
         # place the deps alongside the exe so that
         # they end up in the search path
@@ -209,7 +214,7 @@ class ElfDeps(DepBase):
         lines = out.split("\n")
         return lines
 
-    def rewrite_dep(self, objfile, depname, old_dep, new_dep):
+    def rewrite_dep(self, objfile, depname, old_dep, new_dep, final_lib_dir):
         subprocess.check_call(
             [self.patchelf, "--replace-needed", depname, new_dep, objfile]
         )
@@ -261,7 +266,7 @@ class MachDeps(DepBase):
                     deps.append(os.path.normcase(m.group(1)))
         return deps
 
-    def rewrite_dep(self, objfile, depname, old_dep, new_dep):
+    def rewrite_dep(self, objfile, depname, old_dep, new_dep, final_lib_dir):
         if objfile.endswith(".dylib"):
             # Erase the original location from the id of the shared
             # object.  It doesn't appear to hurt to retain it, but
@@ -269,8 +274,12 @@ class MachDeps(DepBase):
             subprocess.check_call(
                 ["install_name_tool", "-id", os.path.basename(objfile), objfile]
             )
+        final_dep = os.path.join(
+            final_lib_dir, os.path.relpath(new_dep, self.munged_lib_dir)
+        )
+
         subprocess.check_call(
-            ["install_name_tool", "-change", depname, new_dep, objfile]
+            ["install_name_tool", "-change", depname, final_dep, objfile]
         )