Instrumented libraries: overhaul RPATH handling.

third_party/instrumented_libraries/download_build_install.py

 #!/usr/bin/python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Downloads, builds (with instrumentation) and installs shared libraries."""
 
 import argparse
 import os
 import platform
@@ skipping 12 matching lines @@
 
   def __enter__(self):
     self.old_path = os.getcwd()
     os.chdir(self.path)
     return self
 
   def __exit__(self, exc_type, exc_value, traceback):
     os.chdir(self.old_path)
 
 
+script_absolute_path = os.path.dirname(os.path.abspath(__file__))

[Alexander Potapenko, 2014/11/17 19:29:00]

I think global variables are named in CAPITAL_CASE_WITH_UNDERSCORES.

+
 def get_script_absolute_path():
-  return os.path.dirname(os.path.abspath(__file__))
-
+  return script_absolute_path
 
 def get_package_build_dependencies(package):
   command = 'apt-get -s build-dep %s | grep Inst | cut -d " " -f 2' % package
   command_result = subprocess.Popen(command, stdout=subprocess.PIPE,
                                     shell=True)
   if command_result.wait():
     raise Exception('Failed to determine build dependencies for %s' % package)
   build_dependencies = [l.strip() for l in command_result.stdout]
   return build_dependencies
 
@@ skipping 33 matching lines @@
     print stdout
   if child.returncode:
     raise Exception('Failed to run: %s' % command)
 
 
 def run_shell_commands(commands, verbose=False, environment=None):
   for command in commands:
     shell_call(command, verbose, environment)
 
 
+def fix_rpaths(destdir):
+  # TODO(earthdok): reimplement fix_rpaths.sh in Python.
+  shell_call("%s/fix_rpaths.sh %s/lib" % (get_script_absolute_path(), destdir))
+
+
 def destdir_configure_make_install(parsed_arguments, environment,
                                    install_prefix):
   configure_command = './configure %s' % parsed_arguments.extra_configure_flags
   configure_command += ' --libdir=/lib/'
   # Installing to a temporary directory allows us to safely clean up the .la
   # files below.
   destdir = '%s/debian/instrumented_build' % os.getcwd()
   # Some makefiles use BUILDROOT instead of DESTDIR.
   make_command = 'make DESTDIR=%s BUILDROOT=%s' % (destdir, destdir)
   run_shell_commands([
       configure_command,
       '%s -j%s' % (make_command, parsed_arguments.jobs),
       # Parallel install is flaky for some packages.
       '%s install -j1' % make_command,
       # Kill the .la files. They contain absolute paths, and will cause build
       # errors in dependent libraries.
-      'rm %s/lib/*.la -f' % destdir,
+      'rm %s/lib/*.la -f' % destdir],
+                     parsed_arguments.verbose, environment)

[Alexander Potapenko, 2014/11/17 19:29:00]

Please fix the indentation.

+  fix_rpaths(destdir)
+  shell_call(
       # Now move the contents of the temporary destdir to their final place.
-      'cp %s/* %s/ -rdf' % (destdir, install_prefix)],
-                     parsed_arguments.verbose, environment)
+      'cp %s/* %s/ -rdf' % (destdir, install_prefix),
+      parsed_arguments.verbose, environment)
 
 
 def nss_make_and_copy(parsed_arguments, environment, install_prefix):
   # NSS uses a build system that's different from configure/make/install. All
   # flags must be passed as arguments to make.
   make_args = []
   # Do an optimized build.
   make_args.append('BUILD_OPT=1')
   # Set USE_64=1 on x86_64 systems.
   if platform.architecture()[0] == '64bit':
@@ skipping 10 matching lines @@
   make_args.append('NSPR_INCLUDE_DIR=/usr/include/nspr')
   make_args.append('NSPR_LIB_DIR=%s/lib' % install_prefix)
   make_args.append('NSS_ENABLE_ECC=1')
   # Make sure we don't override the default flags.
   for variable in ['CFLAGS', 'CXXFLAGS', 'LDFLAGS']:
     del environment[variable]
   with ScopedChangeDirectory('nss') as cd_nss:
     # -j is not supported
     shell_call('make %s' % ' '.join(make_args), parsed_arguments.verbose,
                environment)
+    fix_rpaths(os.getcwd())
     # 'make install' is not supported. Copy the DSOs manually.
     install_dir = '%s/lib/' % install_prefix
     for (dirpath, dirnames, filenames) in os.walk('./lib/'):
       for filename in filenames:
         if filename.endswith('.so'):
           full_path = os.path.join(dirpath, filename)
           if parsed_arguments.verbose:
             print 'download_build_install.py: installing %s' % full_path
           shutil.copy(full_path, install_dir)
 
 
 def libcap2_make_install(parsed_arguments, environment, install_prefix):
   # libcap2 doesn't come with a configure script
   make_args = [
       '%s="%s"' % (name, environment[name])
       for name in['CC', 'CXX', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS']]
   shell_call('make -j%s %s' % (parsed_arguments.jobs, ' '.join(make_args)),
              parsed_arguments.verbose, environment)
+  destdir = '%s/debian/instrumented_build' % os.getcwd()
   install_args = [
-      'DESTDIR=%s' % install_prefix,
+      'DESTDIR=%s' % destdir,
       # Do not install in lib64/.
       'lib=lib',
       # Skip a step that requires sudo.
       'RAISE_SETFCAP=no'
   ]
   shell_call('make -j%s install %s' %
              (parsed_arguments.jobs, ' '.join(install_args)),
              parsed_arguments.verbose, environment)
+  fix_rpaths(destdir)
+  shell_call([
+      # Now move the contents of the temporary destdir to their final place.
+      'cp %s/* %s/ -rdf' % (destdir, install_prefix)],
+                     parsed_arguments.verbose, environment)
 
 
 def libpci3_make_install(parsed_arguments, environment, install_prefix):
   # pciutils doesn't have a configure script
   # This build script follows debian/rules.
 
   # Find out the package version. We'll use this when creating symlinks.
   dir_name = os.path.split(os.getcwd())[-1]
   match = re.match('pciutils-(\d+\.\d+\.\d+)', dir_name)
   if match is None:
@@ skipping 19 matching lines @@
       'IDSDIR=/usr/share/misc',
   ]
   install_args = ['DESTDIR=%s' % destdir]
   run_shell_commands([
       'mkdir -p %s-udeb/usr/bin' % destdir,
       'make -j%s %s' % (parsed_arguments.jobs, ' '.join(make_args + paths)),
       'make -j%s %s install' % (
           parsed_arguments.jobs,
           ' '.join(install_args + paths))],
                      parsed_arguments.verbose, environment)
+  fix_rpaths(destdir)
   # Now move the contents of the temporary destdir to their final place.
   run_shell_commands([
       'cp %s/* %s/ -rd' % (destdir, install_prefix),
       'install -m 644 lib/libpci.so* %s/lib/' % install_prefix,
       'ln -sf libpci.so.%s %s/lib/libpci.so.3' % (version, install_prefix)],
                      parsed_arguments.verbose, environment)
 
 
 def build_and_install(parsed_arguments, environment, install_prefix):
   if parsed_arguments.build_method == 'destdir':
@@ skipping 158 matching lines @@
   os.chdir(get_script_absolute_path())
   # Ensure all build dependencies are installed.
   if parsed_arguments.check_build_deps:
     check_package_build_dependencies(parsed_arguments.package)
 
   download_build_install(parsed_arguments)
 
 
 if __name__ == '__main__':
   main()