try lief-patchelf

Author: mayeut

src/auditwheel/patcher.py

@@ -27,35 +27,39 @@ def get_rpath(self, file_name: Path) -> str:
         raise NotImplementedError
 
 
-def _verify_patchelf() -> None:
-    """This function looks for the ``patchelf`` external binary in the PATH,
+def _verify_patchelf() -> str:
+    """This function looks for the ``lief-patchelf`` or ``patchelf`` external binary in the PATH,
     checks for the required version, and throws an exception if a proper
     version can't be found. Otherwise, silence is golden
     """
-    if not which("patchelf"):
-        msg = "Cannot find required utility `patchelf` in PATH"
-        raise ValueError(msg)
-    try:
-        version = check_output(["patchelf", "--version"]).decode("utf-8")
-    except CalledProcessError:
-        msg = "Could not call `patchelf` binary"
-        raise ValueError(msg) from None
-
-    m = re.match(r"patchelf\s+(\d+(.\d+)?)", version)
-    if m and tuple(int(x) for x in m.group(1).split(".")) >= (0, 14):
-        return
-    msg = f"patchelf {version} found. auditwheel repair requires patchelf >= 0.14."
-    raise ValueError(msg)
+    result = which("lief-patchelf")
+    if result is None:
+        result = which("patchelf")
+        if not result:
+            msg = "Cannot find required utility `patchelf` in PATH"
+            raise ValueError(msg)
+        try:
+            version = check_output(["patchelf", "--version"]).decode("utf-8")
+        except CalledProcessError:
+            msg = "Could not call `patchelf` binary"
+            raise ValueError(msg) from None
+
+        m = re.match(r"patchelf\s+(\d+(.\d+)?)", version)
+        if not (m and tuple(int(x) for x in m.group(1).split(".")) >= (0, 14)):
+            msg = f"patchelf {version} found. auditwheel repair requires patchelf >= 0.14."
+            raise ValueError(msg)
+
+    return result
 
 
 class Patchelf(ElfPatcher):
     def __init__(self) -> None:
-        _verify_patchelf()
+        self.patchelf_path = _verify_patchelf()
 
     def replace_needed(self, file_name: Path, *old_new_pairs: tuple[str, str]) -> None:
         check_call(
             [
-                "patchelf",
+                self.patchelf_path,
                 *chain.from_iterable(("--replace-needed", *pair) for pair in old_new_pairs),
                 file_name,
             ],
@@ -64,18 +68,20 @@ def replace_needed(self, file_name: Path, *old_new_pairs: tuple[str, str]) -> No
     def remove_needed(self, file_name: Path, *sonames: str) -> None:
         check_call(
             [
-                "patchelf",
+                self.patchelf_path,
                 *chain.from_iterable(("--remove-needed", soname) for soname in sonames),
                 file_name,
             ],
         )
 
     def set_soname(self, file_name: Path, new_so_name: str) -> None:
-        check_call(["patchelf", "--set-soname", new_so_name, file_name])
+        check_call([self.patchelf_path, "--set-soname", new_so_name, file_name])
 
     def set_rpath(self, file_name: Path, rpath: str) -> None:
-        check_call(["patchelf", "--remove-rpath", file_name])
-        check_call(["patchelf", "--force-rpath", "--set-rpath", rpath, file_name])
+        check_call([self.patchelf_path, "--remove-rpath", file_name])
+        check_call([self.patchelf_path, "--force-rpath", "--set-rpath", rpath, file_name])
 
     def get_rpath(self, file_name: Path) -> str:
-        return check_output(["patchelf", "--print-rpath", file_name]).decode("utf-8").strip()
+        return (
+            check_output([self.patchelf_path, "--print-rpath", file_name]).decode("utf-8").strip()
+        )

tests/integration/test_manylinux.py

@@ -1025,6 +1025,7 @@ def any_manylinux_img(self, request):
                         f"curl -fsSLo /tmp/lief-tools.zip {lief_patchelf_url}",
                         "bash -c 'cd /tmp && unzip /tmp/lief-tools.zip'",
                         "mv -f /tmp/bin/lief-patchelf /usr/local/bin/",
+                        "chmod +x /usr/local/bin/lief-patchelf",
                     ),
                 )