wip

Author: mxcl

brewkit/scripts/fix-macho.rb

@@ -71,46 +71,36 @@ def fix_install_names
     next if lib.start_with? '/usr/lib' or lib.start_with? '/System/' or lib.start_with? '/Library/'
 
     og_lib_name = lib
+    file = $LIBS.find{ |dep| lib_basename(dep['string']) == lib_basename(lib) }
 
-    if lib.start_with? $PKGX_DIR and not lib.start_with? $prefix
-      # should never be hit really since the linker by default takes the install name
-      # of the library it links to and for all routes that should already be set by us since it will be a dep
-      # it is here though on the off chance.
-      rel_path = Pathname.new(lib).relative_path_from($PKGX_DIR)
-      rel_path = rel_path.sub(%r{/v(\d+)\.(\d+\.)+\d+[a-z]?/}, '/v\1/')  # use the pkgx `v` prefixed symlink
-      rel_path = rel_path.sub(%r{\.(\d+)\.(\d+\.)+\d+\.dylib$}, '.\1.dylib')  # use the dylib symlink
-      change_install_name og_lib_name, "@rpath/#{rel_path}"
-    else
-      file = $LIBS.find{ |dep| lib_basename(dep['string']) == lib_basename(lib) }
-      if file
-        lib = file['string']
-        # we sporadically use --prefix=/usr/local in conjunction with DESTDIR to work
-        # around specifying eg. /etc as the conf path which then fails builds since it cannot write there
-        if lib.start_with? $prefix or lib.start_with? "/usr/local/lib"
-
-          if lib.start_with? "/usr/local/lib"
-            lib = lib.sub(%r{^/usr/local}, $prefix)
-          end
-
-          rel_path = Pathname.new(lib).relative_path_from(Pathname.new($file.filename).parent)
-          if $file.filetype == :execute
-            change_install_name og_lib_name, "@executable_path/#{rel_path}"
-          else
-            change_install_name og_lib_name, "@loader_path/#{rel_path}"
-          end
-        else
-          rel_path = Pathname.new(file['string']).relative_path_from($PKGX_DIR)
-          rel_path = rel_path.sub(%r{/v(\d+)\.(\d+\.)+\d+[a-z]?/}, '/v\1/')  # use the pkgx `v` prefixed symlink
-          rel_path = rel_path.sub(%r{\.(\d+)\.(\d+\.)+\d+\.dylib$}, '.\1.dylib')  # use the dylib symlink
-          change_install_name og_lib_name, "@rpath/#{rel_path}"
+    if file
+      lib = file['string']
+      # we sporadically use --prefix=/usr/local in conjunction with DESTDIR to work
+      # around specifying eg. /etc as the conf path which then fails builds since it cannot write there
+      if lib.start_with? $prefix or lib.start_with? "/usr/local/lib"
+
+        if lib.start_with? "/usr/local/lib"
+          lib = lib.sub(%r{^/usr/local}, $prefix)
         end
-      elsif lib.start_with? '@rpath/'
-        foo = lib.sub(%r{^@rpath}, $PKGX_DIR)
-        foo = foo.sub(%r{/v.*$}, '')
-        pkgs = ENV['PKGS'].split(":").map{ |pkg| pkg.sub(%r{/v.*$}, '').sub('/pkgs/', '/dst/') }
-        if not pkgs.include? foo
-          puts "::error file=#{$file.filename}::no fix available for: #{lib}"
+
+        rel_path = Pathname.new(lib).relative_path_from(Pathname.new($file.filename).parent)
+        if $file.filetype == :execute
+          change_install_name og_lib_name, "@executable_path/#{rel_path}"
+        else
+          change_install_name og_lib_name, "@loader_path/#{rel_path}"
         end
+      else
+        rel_path = Pathname.new(file['string']).relative_path_from($PKGX_DIR)
+        rel_path = rel_path.sub(%r{/v(\d+)\.(\d+\.)+\d+[a-z]?/}, '/v\1/')  # use the pkgx `v` prefixed symlink
+        rel_path = rel_path.sub(%r{\.(\d+)\.(\d+\.)+\d+\.dylib$}, '.\1.dylib')  # use the dylib symlink
+        change_install_name og_lib_name, "@rpath/#{rel_path}"
+      end
+    elsif lib.start_with? '@rpath/'
+      foo = lib.sub(%r{^@rpath/}, '')
+      foo = foo.sub(%r{/v.*$}, '')
+      pkgs = ENV['PKGS'].split(":").map{ |pkg| pkg.sub(%r{/v.*$}, '').sub(%r{^.*/pkgs/}, '') }
+      if not pkgs.include? foo
+        puts "::error file=#{$file.filename}::no fix available for: #{lib}"
       end
     end
   end