delocate/tools.py (_delete_rpaths, _remove_absolute_rpaths): Delete unique rpaths in one install_name_tool call, loop until done

Author: mkoeppe

delocate/tools.py

@@ -753,19 +753,25 @@ def _delete_rpaths(
     filename : str
         filename of library
     rpaths : Iterable[str]
-        rpaths to delete
+        rpaths to delete, must not contain duplicates
     ad_hoc_sign : {True, False}, optional
-        If True, sign file with ad-hoc signature
+        If True, sign file with ad-hoc signature if any change was made
     """
-    for rpath in rpaths:
+    delete_rpath_args = []
+    for rpath in _unique_everseen(rpaths):
         logger.info("Sanitize: Deleting rpath %r from %r", rpath, filename)
         # We can run these as one command to install_name_tool if there are
         # no duplicates. When there are duplicates, we need to delete them
-        # separately.
-        _run(
-            ["install_name_tool", "-delete_rpath", rpath, filename],
-            check=True,
-        )
+        # separately. This must be done by the caller.
+        delete_rpath_args.extend(["-delete_rpath", rpath])
+
+    if not delete_rpath_args:
+        return
+
+    _run(
+        ["install_name_tool"] + delete_rpath_args + [filename],
+        check=True,
+    )
     if ad_hoc_sign:
         replace_signature(filename, "-")
 
@@ -808,17 +814,24 @@ def _remove_absolute_rpaths(filename: str, ad_hoc_sign: bool = True) -> None:
     filename : str
         filename of library
     ad_hoc_sign : {True, False}, optional
-        If True, sign file with ad-hoc signature
+        If True, sign file with ad-hoc signature if any change was made
     """
-    _delete_rpaths(
-        filename,
-        (
-            rpath
-            for rpath in itertools.chain(*_get_rpaths(filename).values())
-            if not _is_rpath_sanitary(rpath)
-        ),
-        ad_hoc_sign,
-    )
+    any_change = False
+    while rpaths := [
+        rpath
+        for rpath in _unique_everseen(
+            itertools.chain(*_get_rpaths(filename).values()),
+        )
+        if not _is_rpath_sanitary(rpath)
+    ]:
+        _delete_rpaths(
+            filename,
+            rpaths,
+            ad_hoc_sign=False,
+        )
+        any_change = True
+    if any_change and ad_hoc_sign:
+        replace_signature(filename, "-")
 
 
 def zip2dir(