Also fixup dependencies names & ids

Author: tiennou

script/repackage-dylibs.rb

@@ -44,23 +44,25 @@ def note(msg)
 TARGET_EXECUTABLE_PATH = File.join(TARGET_BUILD_DIR, EXECUTABLE_PATH)
 TARGET_FRAMEWORKS_PATH = File.join(TARGET_BUILD_DIR, FRAMEWORKS_FOLDER_PATH)
 
-def extract_link_dependencies
-  deps = `otool -L #{TARGET_EXECUTABLE_PATH}`
+def extract_link_dependencies(executable)
+  deps = `otool -L #{executable}`
 
   lines = deps.split("\n").map(&:strip)
   lines.shift
-  lines.shift
+  # lines.shift
   lines.map do |dep|
     path, compat, current = /^(.*) \(compatibility version (.*), current version (.*)\)$/.match(dep)[1..3]
     err "Failed to parse #{dep}" if path.nil?
 
     dep = OpenStruct.new
+    dep.is_self = (File.basename(path) == File.basename(executable))
+    dep.executable = executable
     dep.install_name = path
     dep.current_version = current
     dep.compat_version = compat
     dep.type = File.extname(path)
     dep.name = File.basename(path)
-    dep.is_packaged = (dep.install_name =~ /^@rpath/)
+    dep.is_packaged = !!(dep.install_name =~ /^@rpath/)
     dep.path = if dep.install_name =~ /^@rpath/
       File.join(TARGET_FRAMEWORKS_PATH, dep.name)
     else
@@ -72,7 +74,7 @@ def extract_link_dependencies
 end
 
 def repackage_dependency(dep)
-  return if dep.is_packaged or dep.path =~ /^(\/usr\/lib|\/System\/Library)/
+  return if dep.is_self or dep.is_packaged or dep.path =~ /^(\/usr\/lib|\/System\/Library)/
 
   note "Packaging #{dep.name}…"
 
@@ -88,22 +90,32 @@ def repackage_dependency(dep)
     note "Copying #{dep[:path]} to TARGET_FRAMEWORKS_PATH"
     FileUtils.cp dep[:path], TARGET_FRAMEWORKS_PATH
 
-    out = `install_name_tool -change #{dep.path} "@rpath/#{dep.name}" #{TARGET_EXECUTABLE_PATH}`
+    out = `install_name_tool -change #{dep.path} "@rpath/#{dep.name}" #{dep.executable}`
     if $? != 0
       err "install_name_tool failed with error #{$?}:\n#{out}"
     end
 
     dep.path = File.join(TARGET_FRAMEWORKS_PATH, dep.name)
     dep.install_name = "@rpath/#{dep.name}"
     dep.is_packaged = true
-
   else
     warn "Unhandled type #{dep.type} for #{dep.path}, ignoring"
   end
 end
 
-extract_link_dependencies.each do |dep|
+def fix_install_id(dep)
+  note "Fixing #{dep.name} install_name id…"
+  out = `install_name_tool -id @rpath/#{dep.name} #{dep.executable}`
+  if $? != 0
+    err "install_name_tool failed with error #{$?}:\n#{out}"
+  end
+end
+
+deps = extract_link_dependencies(TARGET_EXECUTABLE_PATH)
+while (dep = deps.shift) do
   repackage_dependency dep
+  fix_install_id dep if dep.is_self and dep.executable != TARGET_EXECUTABLE_PATH
+  deps += extract_link_dependencies(dep[:path]) if dep.is_packaged and not dep.is_self
 end
 
 note "Packaging done"