Merge remote-tracking branch 'my/binary_packages' into binary_packages

gartung · gartung · commit 9d94d242fcbb · 2016-12-05T12:53:29.000-06:00
diff --git a/lib/spack/spack/relocate.py b/lib/spack/spack/relocate.py
@@ -30,38 +30,36 @@ def get_existing_elf_rpaths(path_name, patchelf_executable):
 def modify_macho_object(path_name, old_dir, new_dir):
     """
     Modify MachO binaries by changing rpaths,and id and dependency lib paths.
-
+    
     Examines the output of otool -l for these three patterns
-
+    
           cmd LC_ID_DYLIB
       cmdsize 160
          name /Users/gartung/spack-macdev/opt/spack/darwin-x86_64/clang-7.0.2
     -apple/tcl-8.6.5-xfeydlhaojmei6iws2rnxndvriym242k/lib/libtcl8.6.dylib 
     (offset 24)
-
+    
           cmd LC_LOAD_DYLIB
       cmdsize 160
          name /Users/gartung/spack-macdev/opt/spack/darwin-x86_64/clang-7.0.2
     -apple/zlib-1.2.8-cyvcqvrzlgurne424y55hxvfucvz2354/lib/libz.1.dylib 
     (offset 24)
-
+    
           cmd LC_RPATH
       cmdsize 128
          path /Users/gartung/spack-macdev/opt/spack/darwin-x86_64/clang-7.0.2
     -apple/xz-5.2.2-d4ecxpuzf2g3ycz3cnj3xmdj7zdnuqwb/lib 
     (offset 12)
-  
+    
     the old install dir in LC_LOAD_DYLIB is replaced with the new install dir
-    using 
-        install_name_tool -id newid binary
-
+    using install_name_tool -id newid binary
+    
     the old install dir in LC_LOAD_DYLIB is replaced with the new install dir
-    using 
-        install_name_tool -change old new binary
-
+    using install_name_tool -change old new binary
+    
     the old install dir in LC_RPATH is replaced with the new install dir using
         install_name_tool  -rpath old new binary
-       
+    
     """
     command = which('otool')
     output  = command("-l", path_name, output=str, err=str)
