order rework (#7)

* order rework

* remove testing print

* fix formatting and debug print

shrinkwrap/cli.py

@@ -34,11 +34,11 @@ def shrinkwrap(file: str, output: Optional[str], link_strategy: str):
 
  strategy = LinkStrategy.select_by_name(link_strategy)
  resolution = strategy.explore(binary, file)
- needed = binary.libraries
+ needed = list(binary.libraries)
+ for name in needed:
+ binary.remove_library(name)
 
- for soname, lib in resolution.items():
- if soname in needed:
- binary.remove_library(soname)
+ for soname, lib in reversed(resolution.items()):
  binary.add_library(lib)
 
  # we need to update the VERNEED entries now to match

shrinkwrap/elf.py

@@ -3,6 +3,7 @@
 import os
 import re
 from abc import ABC, abstractmethod
+from collections import OrderedDict
 from typing import Dict, Iterable, Optional
 
 import lief # type: ignore
@@ -35,7 +36,7 @@ class NativeLinkStrategy(LinkStrategy):
  def explore(self, binary: lief.Binary, filename: str) -> Dict[str, str]:
  interpreter = Command(binary.interpreter)
  resolution = interpreter("--list", filename)
- result = {}
+ result = OrderedDict()
  # TODO: Figure out why `--list` and `ldd` produce different outcomes
  # specifically for the interpreter.
  # https://gist.github.com/fzakaria/3dc42a039401598d8e0fdbc57f5e7eae
@@ -91,7 +92,7 @@ def explore(self, binary: lief.Binary, filename: str) -> Dict[str, str]:
  Determine the linking for all needed objects
  """
 
- result = {}
+ result = OrderedDict()
  queue = [binary]
  rpaths = []
  ld_library_path = os.environ.get("LD_LIBRARY_PATH", "").split(":")